diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0edc87f2f..5d352781e 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -88,22 +88,36 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-shiro-api</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>aaa-app-config</classifier>
             </dependency>
-
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro-api</artifactId>
+                <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-shiro</artifactId>
+                <version>${project.version}</version>
+                <type>py</type>
+                <classifier>idmtool</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>aaa-app-config</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-shiro</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>aaa-datastore-config</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-tokenauthrealm</artifactId>
@@ -199,6 +213,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>odl-aaa-password-service</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-aaa-shiro</artifactId>
diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 41a3dc007..bd0673f59 100644
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-password-service</artifactId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -70,7 +69,6 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-encryption-service</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -81,28 +79,24 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-api</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-cert</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>aaa-app-config</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>aaa-datastore-config</classifier>
         </dependency>
@@ -125,7 +119,6 @@
             <!-- finalname="bin/idmtool" -->
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>py</type>
             <classifier>idmtool</classifier>
         </dependency>