diff --git a/README.md b/README.md
index 0c090797..1faaec31 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [Spring Cloud](http://projects.spring.io/spring-cloud/) integration with [Kubernetes](http://kubernetes.io/)
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes/) ![Apache 2](http://img.shields.io/badge/license-Apache%202-red.svg)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes/) ![Apache 2](http://img.shields.io/badge/license-Apache%202-red.svg)
 
 ### Features
 
@@ -22,9 +22,9 @@
 ---
 ### DiscoveryClient for Kubernetes
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes/)
-[![Javadocs](http://www.javadoc.io/badge/io.fabric8/spring-cloud-starter-kubernetes.svg?color=blue)](http://www.javadoc.io/doc/io.fabric8/spring-cloud-starter-kubernetes)
-[![Dependency Status](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes/badge?style=flat)](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes/)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes/)
+[![Javadocs](http://www.javadoc.io/badge/org.springframework.cloud/spring-cloud-starter-kubernetes.svg?color=blue)](http://www.javadoc.io/doc/org.springframework.cloud/spring-cloud-starter-kubernetes)
+[![Dependency Status](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes/badge?style=flat)](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes/)
 
 
 This project provides an implementation of [Discovery Client](https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/DiscoveryClient.java) for [Kubernetes](http://kubernetes.io). This allows you to query Kubernetes endpoints *(see [services](http://kubernetes.io/docs/user-guide/services/))* by name.
@@ -32,7 +32,7 @@ This is something that you get for free just by adding the following dependency
 
 ```xml
 <dependency>
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes</artifactId>
     <version>${latest.version></version>
 </dependency>
@@ -310,15 +310,15 @@ This allows the user to customize the configuration that will be applied in and
 
 ### Ribbon discovery in Kubernetes
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes-netflix/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes-netflix/)
-[![Javadocs](http://www.javadoc.io/badge/io.fabric8/spring-cloud-starter-kubernetes-netflix.svg?color=blue)](http://www.javadoc.io/doc/io.fabric8/spring-cloud-starter-kubernetes-netflix)
-[![Dependency Status](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes-netflix/badge?style=flat)](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes-netflix/)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-netflix/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-netflix/)
+[![Javadocs](http://www.javadoc.io/badge/org.springframework.cloud/spring-cloud-starter-kubernetes-netflix.svg?color=blue)](http://www.javadoc.io/doc/org.springframework.cloud/spring-cloud-starter-kubernetes-netflix)
+[![Dependency Status](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-netflix/badge?style=flat)](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-netflix/)
 
 A Kubernetes based `ServerList` for Ribbon has been implemented. The implementation is part of the [spring-cloud-kubernetes-ribbon](spring-cloud-kubernetes-ribbon/pom.xml) module and you can use it by adding:
 
 ```xml
 <dependency>
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes-netflix</artifactId>
     <version>${latest.version></version>
 </dependency>
@@ -340,9 +340,9 @@ Examples that are using this module for ribbon discovery are:
 
 ### Zipkin discovery in Kubernetes
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes-zipkin/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-starter-kubernetes-zipkin/)
-[![Javadocs](http://www.javadoc.io/badge/io.fabric8/spring-cloud-starter-kubernetes-zipkin.svg?color=blue)](http://www.javadoc.io/doc/io.fabric8/spring-cloud-starter-kubernetes-zipkin)
-[![Dependency Status](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes-zipkin/badge?style=flat)](https://www.versioneye.com/java/io.fabric8:spring-cloud-starter-kubernetes-zipkin/)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin/)
+[![Javadocs](http://www.javadoc.io/badge/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin.svg?color=blue)](http://www.javadoc.io/doc/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin)
+[![Dependency Status](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-zipkin/badge?style=flat)](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-zipkin/)
 
 [Zipkin](https://github.com/openzipkin/zipkin) is a distributed tracing system and it is also supported by [Sleuth](https://github.com/spring-cloud/spring-cloud-sleuth).
 
@@ -350,7 +350,7 @@ Discovery of the services required by Zipkin (e.g. `zipkin-query`) is provided b
 
 ```xml
 <dependency>
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes-zipkin</artifactId>
     <version>${latest.version></version>
 </dependency>
@@ -365,9 +365,9 @@ Examples of application that are using Zipkin discovery in Kubernetes:
 
 ### ConfigMap Archaius Bridge
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-kubernetes-archaius/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/io.fabric8/spring-cloud-kubernetes-archaius/)
-[![Javadocs](http://www.javadoc.io/badge/io.fabric8/spring-cloud-kubernetes-archaius.svg?color=blue)](http://www.javadoc.io/doc/io.fabric8/spring-cloud-kubernetes-archaius)
-[![Dependency Status](https://www.versioneye.com/java/io.fabric8:spring-cloud-kubernetes-archaius/badge?style=flat)](https://www.versioneye.com/java/io.fabric8:spring-cloud-kubernetes-archaius/)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-kubernetes-archaius/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-kubernetes-archaius/)
+[![Javadocs](http://www.javadoc.io/badge/org.springframework.cloud/spring-cloud-kubernetes-archaius.svg?color=blue)](http://www.javadoc.io/doc/org.springframework.cloud/spring-cloud-kubernetes-archaius)
+[![Dependency Status](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-kubernetes-archaius/badge?style=flat)](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-kubernetes-archaius/)
 
 Section [ConfigMap PropertySource](#configmap-propertysource) provides a brief explanation on how to configure spring boot application via ConfigMap.
 This approach will aid in creating the configuration properties objects that will be passed in our application. If our application is using Archaius it will indirectly benefit by it.
@@ -410,7 +410,7 @@ The project provides a "starter" module, so you just need to add the following d
 
 ```xml
 <dependency>
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes</artifactId>
     <version>x.y.z</version>
 </dependency>
diff --git a/pom.xml b/pom.xml
index debac7c7..d7e05d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,18 +26,18 @@
         <version>9</version>
     </parent>
 
-    <groupId>io.fabric8</groupId>
-    <artifactId>spring-cloud-kubernetes-project</artifactId>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-kubernetes</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Project</name>
+    <name>Spring Cloud Kubernetes</name>
 
-    <url>http://fabric8.io/</url>
+    <url>http://cloud.spring.io</url>
     <inceptionYear>2016</inceptionYear>
 
     <organization>
-        <name>Red Hat</name>
-        <url>http://redhat.com</url>
+        <name>Pivotal Software, Inc.</name>
+        <url>http://www.spring.io</url>
     </organization>
 
     <licenses>
@@ -48,32 +48,13 @@
         </license>
     </licenses>
 
-    <!-- including A developer as it's required by the maven poms going into
-      central -->
-    <developers>
-        <developer>
-            <id>geeks</id>
-            <name>Fabric8 Development Team</name>
-            <organization>fabric8</organization>
-            <organizationUrl>http://fabric8.io/</organizationUrl>
-        </developer>
-    </developers>
-
     <scm>
-        <connection>scm:git:git@github.com:fabric8io/spring-cloud-kubernetes.git</connection>
-        <developerConnection>scm:git:git@github.com:fabric8io/spring-cloud-kubernetes.git</developerConnection>
-        <url>http://github.com/fabric8io/spring-cloud-kubernetes/</url>
-        <tag>${project.version}</tag>
+        <url>https://github.com/spring-cloud-incubator/spring-cloud-kubernetes</url>
+        <connection>scm:git:git://github.com/spring-cloud-incubator/spring-cloud-kubernetes.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/spring-cloud-incubator/spring-cloud-kubernetes.git</developerConnection>
+        <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <repository>
-            <id>oss-sonatype-staging</id>
-            <name>Sonatype Staging Repository</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-        </repository>
-    </distributionManagement>
-
     <properties>
         <!-- Dependency Versions -->
         <commons-logging.version>1.2</commons-logging.version>
@@ -142,37 +123,37 @@
 
             <!-- Own dependencies -->
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-archaius</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-discovery</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-hystrix</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-ribbon</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.fabric8</groupId>
+                <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-zipkin</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -285,7 +266,7 @@
                     <boms>
                         <bom>
                             <artifactId>spring-cloud-kubernetes-bom</artifactId>
-                            <name>Fabric8 :: Spring Cloud Kubernetes :: Bom</name>
+                            <name>Spring Cloud Kubernetes :: Bom</name>
                             <dependencies>
                                 <includes>
                                     <include>io.fabric8:kubernetes-*</include>
@@ -304,7 +285,7 @@
                         </bom>
                         <bom>
                             <artifactId>spring-cloud-kubernetes-bom-with-platform-deps</artifactId>
-                            <name>Fabric8 :: Spring Cloud Kubernetes :: Bom with Platform Dependencies</name>
+                            <name>Spring Cloud Kubernetes :: Bom with Platform Dependencies</name>
                             <dependencies>
                                 <includes>
                                     <include>javax.*:*</include>
diff --git a/spring-cloud-kubernetes-archaius/pom.xml b/spring-cloud-kubernetes-archaius/pom.xml
index 492168a0..19e743fe 100644
--- a/spring-cloud-kubernetes-archaius/pom.xml
+++ b/spring-cloud-kubernetes-archaius/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-kubernetes-archaius</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Archaius</name>
+    <name>Spring Cloud Kubernetes :: Archaius</name>
 
     <dependencies>
 
@@ -76,4 +76,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-compat/pom.xml b/spring-cloud-kubernetes-compat/pom.xml
index 4e8941a2..5345ccbf 100644
--- a/spring-cloud-kubernetes-compat/pom.xml
+++ b/spring-cloud-kubernetes-compat/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-kubernetes-compat</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Compatibility</name>
+    <name>Spring Cloud Kubernetes :: Compatibility</name>
 
     <description>Compatibility module to cover for the lack of InetUtils in older version of Spring Cloud Commons.</description>
 
@@ -42,4 +42,4 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-core/pom.xml b/spring-cloud-kubernetes-core/pom.xml
index 3bbd4005..4e39a091 100644
--- a/spring-cloud-kubernetes-core/pom.xml
+++ b/spring-cloud-kubernetes-core/pom.xml
@@ -19,14 +19,14 @@
          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>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-kubernetes-core</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Core</name>
+    <name>Spring Cloud Kubernetes :: Core</name>
 
     <dependencies>
         <dependency>
@@ -95,4 +95,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 9a7ddfea..158b8cd1 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -19,19 +19,19 @@
          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>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-kubernetes-discovery</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Discovery</name>
+    <name>Spring Cloud Kubernetes :: Discovery</name>
 
     <dependencies>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -85,4 +85,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
index 842fb385..1cc71209 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -4,14 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-examples</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kubernetes-reload-example</artifactId>
 
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Examples :: Reload</name>
+    <name>Spring Cloud Kubernetes :: Examples :: Reload</name>
     <description>Example demostrating how to use the configuration reload feature.</description>
 
     <dependencyManagement>
@@ -28,7 +28,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index 5c2d0304..a6f066fc 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +12,7 @@
     <artifactId>spring-cloud-kubernetes-examples</artifactId>
     <packaging>pom</packaging>
 
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Examples</name>
+    <name>Spring Cloud Kubernetes :: Examples</name>
     <description>Examples showing how to use features of Spring Cloud Kubernetes.</description>
 
     <modules>
@@ -20,4 +20,4 @@
     </modules>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-hystrix/pom.xml b/spring-cloud-kubernetes-hystrix/pom.xml
index ed335f0d..cf2986a2 100644
--- a/spring-cloud-kubernetes-hystrix/pom.xml
+++ b/spring-cloud-kubernetes-hystrix/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-kubernetes-hystrix</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Hystrix</name>
+    <name>Spring Cloud Kubernetes :: Hystrix</name>
 
     <dependencies>
         <dependency>
@@ -71,4 +71,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index dd1844de..79323585 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -21,19 +21,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-kubernetes-ribbon</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Ribbon</name>
+    <name>Spring Cloud Kubernetes :: Ribbon</name>
 
     <dependencies>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -129,4 +129,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-kubernetes-zipkin/pom.xml b/spring-cloud-kubernetes-zipkin/pom.xml
index 9e7bae1b..10322de8 100644
--- a/spring-cloud-kubernetes-zipkin/pom.xml
+++ b/spring-cloud-kubernetes-zipkin/pom.xml
@@ -21,19 +21,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-kubernetes-zipkin</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Zipkin</name>
+    <name>Spring Cloud Kubernetes :: Zipkin</name>
 
     <dependencies>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -64,4 +64,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-all/pom.xml
index f0143df8..8c80ba2c 100644
--- a/spring-cloud-starter-kubernetes-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-all/pom.xml
@@ -21,43 +21,43 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes-all</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Starter :: All</name>
+    <name>Spring Cloud Kubernetes :: Starter :: All</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-archaius</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-ribbon</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-hystrix</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-zipkin</artifactId>
         </dependency>
 
@@ -77,4 +77,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-starter-kubernetes-netflix/pom.xml b/spring-cloud-starter-kubernetes-netflix/pom.xml
index 7ab29d2f..6abb0461 100644
--- a/spring-cloud-starter-kubernetes-netflix/pom.xml
+++ b/spring-cloud-starter-kubernetes-netflix/pom.xml
@@ -21,30 +21,30 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes-netflix</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Starter :: Netflix</name>
+    <name>Spring Cloud Kubernetes :: Starter :: Netflix</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-ribbon</artifactId>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-starter-kubernetes-zipkin/pom.xml b/spring-cloud-starter-kubernetes-zipkin/pom.xml
index 3193284c..8c60cf51 100644
--- a/spring-cloud-starter-kubernetes-zipkin/pom.xml
+++ b/spring-cloud-starter-kubernetes-zipkin/pom.xml
@@ -21,28 +21,28 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes-zipkin</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Starter :: Zipkin</name>
+    <name>Spring Cloud Kubernetes :: Starter :: Zipkin</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-zipkin</artifactId>
         </dependency>
 
@@ -63,4 +63,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-cloud-starter-kubernetes/pom.xml b/spring-cloud-starter-kubernetes/pom.xml
index f9c85fae..a9c663ea 100644
--- a/spring-cloud-starter-kubernetes/pom.xml
+++ b/spring-cloud-starter-kubernetes/pom.xml
@@ -20,25 +20,25 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>spring-cloud-kubernetes-project</artifactId>
-        <groupId>io.fabric8</groupId>
+        <groupId>org.springframework.cloud</groupId>
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.fabric8</groupId>
+    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-kubernetes</artifactId>
-    <name>Fabric8 :: Spring Cloud Kubernetes :: Starter</name>
+    <name>Spring Cloud Kubernetes :: Starter</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.fabric8</groupId>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-kubernetes-discovery</artifactId>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>