diff --git a/src/alire/alire-uri.ads b/src/alire/alire-uri.ads
index 704899671..13032ff77 100644
--- a/src/alire/alire-uri.ads
+++ b/src/alire/alire-uri.ads
@@ -86,7 +86,7 @@ package Alire.URI with Preelaborate is
 
    subtype Local_URIs is URI_Kinds
      with Static_Predicate =>
-       Local_URIs in Local_VCS_URIs | Local_Other;
+       Local_URIs in Local_Git | Local_Hg | Local_SVN | Bare_Path | File;
 
    subtype Public_VCS_URIs is URI_Kinds
      with Static_Predicate =>
@@ -94,7 +94,7 @@ package Alire.URI with Preelaborate is
 
    subtype Public_URIs is URI_Kinds
      with Static_Predicate =>
-       Public_URIs in Public_VCS_URIs | Public_Other;
+       Public_URIs in Public_Git | Public_Hg | Public_SVN | Public_Other;
 
    subtype Private_VCS_URIs is URI_Kinds
      with Static_Predicate =>
@@ -102,7 +102,7 @@ package Alire.URI with Preelaborate is
 
    subtype Private_URIs is URI_Kinds
      with Static_Predicate =>
-       Private_URIs in Private_VCS_URIs | SSH_Other;
+       Private_URIs in Private_Git | Private_Hg | Private_SVN | SSH_Other;
 
    subtype Git_URIs is URI_Kinds range Local_Git .. Private_Git;
    subtype Hg_URIs is URI_Kinds range Local_Hg .. Private_Hg;