diff --git a/assembly/pom.xml b/assembly/pom.xml
index 64f3c4a..750514e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -19,24 +19,24 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
+        <groupId>org.apache.jclouds.cli</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.cli</groupId>
+    <groupId>org.apache.jclouds.cli</groupId>
     <artifactId>jclouds-cli</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <name>jclouds :: cli :: assembly</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.cli</groupId>
+            <groupId>org.apache.jclouds.cli</groupId>
             <artifactId>branding</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.cli</groupId>
+            <groupId>org.apache.jclouds.cli</groupId>
             <artifactId>runner</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -170,7 +170,7 @@
                                     mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
                                 </descriptor>
                                 <descriptor>
-                                    mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
+                                    mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
                                 </descriptor>
                             </descriptors>
                             <features>
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 7d80f20..e5c1685 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -1,3 +1,3 @@
-featuresRepositories=mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
+featuresRepositories=mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
 
 featuresBoot=config,jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3
\ No newline at end of file
diff --git a/branding/pom.xml b/branding/pom.xml
index 84e8496..208f0cd 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
+        <groupId>org.apache.jclouds.cli</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.cli</groupId>
+    <groupId>org.apache.jclouds.cli</groupId>
     <artifactId>branding</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
diff --git a/pom.xml b/pom.xml
index ee7d9ef..ae26bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,12 @@
     <modelVersion>4.0.0</modelVersion>
    
     <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>4</version>
+      <groupId>org.apache</groupId>
+      <artifactId>apache</artifactId>
+      <version>13</version>
     </parent>
 
-    <groupId>org.jclouds.cli</groupId>
+    <groupId>org.apache.jclouds.cli</groupId>
     <artifactId>jclouds-cli-pom</artifactId>
     <packaging>pom</packaging>
     <name>jclouds :: cli</name>
@@ -150,16 +150,15 @@
 
     <repositories>
       <repository>
-            <id>jclouds-staging</id>
-            <url>https://oss.sonatype.org/content/repositories/orgjclouds-354</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
+        <id>apache-snapshots</id>
+        <url>https://repository.apache.org/content/repositories/snapshots</url>
+        <releases>
+          <enabled>false</enabled>
+        </releases>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+      </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/releases/</url>
@@ -196,16 +195,4 @@
         </profile>
     </profiles>
 
-    <distributionManagement>
-        <repository>
-            <id>sonatype-nexus-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-            <uniqueVersion>false</uniqueVersion>
-        </repository>
-        <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
 </project>
diff --git a/runner/pom.xml b/runner/pom.xml
index 19671d8..b8966bb 100644
--- a/runner/pom.xml
+++ b/runner/pom.xml
@@ -18,12 +18,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
+        <groupId>org.apache.jclouds.cli</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.cli</groupId>
+    <groupId>org.apache.jclouds.cli</groupId>
     <artifactId>runner</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <name>jclouds :: cli :: runner</name>
@@ -36,13 +36,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-blobstore</artifactId>
             <version>${jclouds.karaf.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.karaf.version}</version>
         </dependency>