diff --git a/aws-elb/pom.xml b/aws-elb/pom.xml
index aaf3830..5b2f927 100644
--- a/aws-elb/pom.xml
+++ b/aws-elb/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs-aws</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-elb</artifactId>
     <name>jclouds Amazon Elastic Load Balancer provider</name>
     <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description>
@@ -58,52 +58,52 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>elb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>elb</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.provider</groupId>
+            <groupId>org.apache.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
diff --git a/aws-iam/pom.xml b/aws-iam/pom.xml
index b824b2a..4d7c08d 100644
--- a/aws-iam/pom.xml
+++ b/aws-iam/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs-aws</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-iam</artifactId>
     <name>jclouds Amazon Identity and Access Management (IAM) provider</name>
     <description>Identity and Access Management (IAM) to Amazon Web Services</description>
@@ -51,26 +51,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>iam</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>iam</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
diff --git a/aws-rds/pom.xml b/aws-rds/pom.xml
index 273cf02..a126315 100644
--- a/aws-rds/pom.xml
+++ b/aws-rds/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs-aws</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-rds</artifactId>
     <name>jclouds Amazon Relational Database Service provider</name>
     <description>Relational Database Service implementation targeted to Amazon Web Services</description>
@@ -51,26 +51,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>rds</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>rds</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
diff --git a/elb/pom.xml b/elb/pom.xml
index 4c8d80f..41d8f40 100644
--- a/elb/pom.xml
+++ b/elb/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs-aws</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>elb</artifactId>
     <name>jcloud elb api</name>
     <description>jclouds components to access an implementation of Elastic Load Balancer</description>
@@ -58,51 +58,51 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.provider</groupId>
+            <groupId>org.apache.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
diff --git a/iam/pom.xml b/iam/pom.xml
index ae38e0e..1d0974b 100644
--- a/iam/pom.xml
+++ b/iam/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-aws</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>iam</artifactId>
   <name>jcloud iam api</name>
   <description>jclouds components to access an implementation of Identity and Access Management (IAM)</description>
@@ -51,19 +51,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>sts</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 85c58a5..72b95ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
+        <groupId>org.apache.jclouds</groupId>
         <artifactId>jclouds-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-aws</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -44,6 +44,16 @@
     </properties>
 
     <repositories>
+      <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-nexus-snapshots</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
diff --git a/rds/pom.xml b/rds/pom.xml
index c0f9ad0..2fc27fb 100644
--- a/rds/pom.xml
+++ b/rds/pom.xml
@@ -22,13 +22,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs-aws</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>rds</artifactId>
     <name>jcloud rds api</name>
     <description>jclouds components to access an implementation of Relational Database Service</description>
@@ -51,19 +51,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>