diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 762e88ec369..e05a6fff830 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -17,6 +17,7 @@
 
     <groupId>org.rhq</groupId>
     <artifactId>rhq-arquillian-agent-plugin-container-embedded</artifactId>
+    <version>4.9.0.JON320GA</version>
     <name>RHQ Arquillian Plugin Container</name>
     <description>RHQ Embedded Agent Plugin Container integration for Arquillian</description>
 
@@ -91,13 +92,13 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-shrinkwrap-agent-plugin-archive</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-shrinkwrap-agent-plugin-archive.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-plugin-container</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-plugin-container.version}</version>
         </dependency>
 
         <!-- 3rd party -->
@@ -124,7 +125,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-arquillian-container-test-plugin</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-arquillian-container-test-plugin.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 390163925bf..d686ea7d2a2 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -11,6 +11,7 @@
    </parent>
 
    <artifactId>rhq-core-plugin-container</artifactId>
+   <version>4.9.0.JON320GA</version>
    <packaging>jar</packaging>
 
    <name>RHQ Plugin Container</name>
@@ -34,13 +35,13 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-comm-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-comm-api.version}</version>
       </dependency>
 
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-client-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-client-api.version}</version>
       </dependency>
 
       <dependency>
@@ -52,7 +53,7 @@
       <dependency>
           <groupId>${rhq.groupId}</groupId>
           <artifactId>rhq-common-drift</artifactId>
-          <version>${project.version}</version>
+          <version>${rhq-common-drift.version}</version>
       </dependency>
 
       <!-- 3rd Party Deps -->
@@ -75,7 +76,7 @@
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>test-utils</artifactId>
-         <version>${project.version}</version>
+         <version>${test-utils.version}</version>
          <scope>test</scope>
       </dependency>
 
@@ -303,7 +304,6 @@
                  <jar destfile="${project.build.testOutputDirectory}/resource-upgrade-test-plugin-duplicate-test-2.0.0.jar">
                     <fileset dir="${project.build.testOutputDirectory}/tmp/duplicate/v2" includes="**/*.class,**/rhq-plugin.xml" />
                  </jar>
-
                  <delete dir="${project.build.testOutputDirectory}/tmp" />
               </target>
             </configuration>
@@ -328,7 +328,7 @@
                 <configuration>
                     <skipTests>${skipTests}</skipTests>
                     <systemPropertyVariables>
-                       <rhq.version>${project.version}</rhq.version>
+                       <rhq.version>${project.parent.version}</rhq.version>
                     </systemPropertyVariables>
 
                     <excludedGroups>arquillian,${rhq.testng.excludedGroups}</excludedGroups>
diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml
index a8d0f936d3c..cb8c2321ff8 100644
--- a/modules/core/plugin-test-api/pom.xml
+++ b/modules/core/plugin-test-api/pom.xml
@@ -21,7 +21,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-plugin-container</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-plugin-container.version}</version>
       </dependency>
 
    </dependencies>
@@ -53,7 +53,7 @@
 		       <dependency>
 		           <groupId>org.rhq</groupId>
 		           <artifactId>rhq-arquillian-agent-plugin-container-embedded</artifactId>
-		           <version>${project.version}</version>
+		           <version>${rhq-arquillian-agent-plugin-container-embedded.version}</version>
 		       </dependency>
 
 		       <dependency>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index c658da17ded..7790ad371e4 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-plugin-container</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-plugin-container.version}</version>
       </dependency>
 
       <dependency>
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index dc175dcd286..131863f4a82 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -59,7 +59,7 @@ Ant Script that provides ways to package the Agent.
          <include name="org/rhq/rhq-core-native-system/${rhq-core-native-system.version}/rhq-core-native-system-${rhq-core-native-system.version}.jar" />
          <include name="org/rhq/rhq-core-domain/${rhq-core-domain.version}/rhq-core-domain-${rhq-core-domain.version}.jar" />
          <include name="org/rhq/rhq-core-plugin-api/${rhq-core-plugin-api.version}/rhq-core-plugin-api-${rhq-core-plugin-api.version}.jar" />
-         <include name="org/rhq/rhq-core-plugin-container/${project.version}/rhq-core-plugin-container-${project.version}.jar" />
+         <include name="org/rhq/rhq-core-plugin-container/${rhq-core-plugin-container.version}/rhq-core-plugin-container-${rhq-core-plugin-container.version}.jar" />
          <include name="org/rhq/rhq-core-client-api/${project.version}/rhq-core-client-api-${project.version}.jar" />
          <include name="org/rhq/rhq-common-drift/${project.version}/rhq-common-drift-${project.version}.jar"/>
          <include name="commons-io/commons-io/1.4/commons-io-1.4.jar"/>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 2177063d22f..0d34243a551 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-plugin-container</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-plugin-container.version}</version>
     </dependency>
 
     <dependency>
@@ -174,6 +174,7 @@ Build-Number=${buildNumber}
                    <property name="rhq-core-plugin-api.version" value="${rhq-core-plugin-api.version}" />
                    <property name="rhq-core-util.version" value="${rhq-core-util.version}" />
                    <property name="rhq-platform-plugin.version" value="${rhq-platform-plugin.version}" />
+                   <property name="rhq-core-plugin-container.version" value="${rhq-core-plugin-container.version}" />
                 </ant>
               </target>
             </configuration>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index e1aef8d5fde..7a6dcfcb665 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -132,7 +132,7 @@
 	        <dependency>
 	            <groupId>org.rhq</groupId>
 	            <artifactId>rhq-core-plugin-container</artifactId>
-	            <version>${project.version}</version>
+	            <version>${rhq-core-plugin-container.version}</version>
 	            <type>test-jar</type>
 	            <scope>test</scope>
 			</dependency>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 1bf0874b107..ce8d5c3cf59 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-plugin-container</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-plugin-container.version}</version>
       </dependency>
 
       <dependency>
diff --git a/modules/plugins/jboss-as-5/testsuite/pom.xml b/modules/plugins/jboss-as-5/testsuite/pom.xml
index 37f4cf0aeda..9abd198e1a6 100644
--- a/modules/plugins/jboss-as-5/testsuite/pom.xml
+++ b/modules/plugins/jboss-as-5/testsuite/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>${rhq.groupId}</groupId>
             <artifactId>rhq-core-plugin-container</artifactId>
-            <version>${rhq.version}</version>
+            <version>${rhq-core-plugin-container.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.xml.bind</groupId>
diff --git a/pom.xml b/pom.xml
index 968a47c5e08..e82a44740ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,6 +418,8 @@
     <rhq-virt-plugin.version>${rhq.pom.version}</rhq-virt-plugin.version>
     <test-utils.version>${rhq.pom.version}</test-utils.version>
     <rhq-modules-parent.version>${rhq.pom.version}</rhq-modules-parent.version>
+    <rhq-shrinkwrap-agent-plugin-archive.version>${rhq.pom.version}</rhq-shrinkwrap-agent-plugin-archive.version>
+    <rhq-arquillian-container-test-plugin.version>${rhq.pom.version}</rhq-arquillian-container-test-plugin.version>
 
   </properties>