diff --git a/examples/pom.xml b/examples/pom.xml
index eae548a1f6..176157a047 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,10 +1,8 @@
-<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">
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.kubernetes</groupId>
 	<artifactId>client-java-examples</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>client-java-examples</name>
 	<url>https://github.com/kubernetes-client/java</url>
@@ -12,12 +10,12 @@
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-api</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-util</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
index 282b818eea..c7d5d46c4a 100644
--- a/kubernetes/pom.xml
+++ b/kubernetes/pom.xml
@@ -1,18 +1,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/maven-v4_0_0.xsd">
+<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>
   <groupId>io.kubernetes</groupId>
   <artifactId>client-java-api</artifactId>
   <packaging>jar</packaging>
   <name>client-java-api</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>0.2-SNAPSHOT</version>
   <url>https://github.com/swagger-api/swagger-codegen</url>
   <description>Swagger Java</description>
-  <scm>
-    <connection>scm:git:git@github.com:kubernetes-client/java.git</connection>
-    <developerConnection>scm:git:git@github.com:kubernetes-client/java.git</developerConnection>
-    <url>https://github.com/kubernetes-client/java</url>
-  </scm>
   <prerequisites>
     <maven>2.2.0</maven>
   </prerequisites>
diff --git a/pom.xml b/pom.xml
index 5527a8e0ca..5c9ada7559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,22 @@
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>client-java</artifactId>
   <groupId>io.kubernetes</groupId>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Kubernetes Client API</name>
 
   <modules>
-    <module>kubernetes</module>
     <module>examples</module>
+    <module>kubernetes</module>
     <module>util</module>
   </modules>
 
   <scm>
-    <connection>scm:git:git@github.com:kubernetes-client/java.git</connection>
-    <developerConnection>scm:git:git@github.com:kubernetes-client/java.git</developerConnection>
-    <url>https://github.com/kubernetes-client/java</url>
+    <connection>scm:git:git@github.com:lwander/java.git</connection>
+    <developerConnection>scm:git:git@github.com:lwander/java.git</developerConnection>
+    <url>https://github.com/lwander/java</url>
+    <tag>HEAD</tag>
   </scm>
 
   <prerequisites>
@@ -45,10 +44,12 @@
     <snapshotRepository>
       <id>ossrh</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <layout>default</layout>
     </snapshotRepository>
     <repository>
       <id>ossrh</id>
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <layout>default</layout>
     </repository>
   </distributionManagement>
 
@@ -60,7 +61,7 @@
         <version>2.5.3</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
-          <releaseProfiles>release</releaseProfiles>
+          <releaseProfiles>release-sign-artifacts</releaseProfiles>
           <goals>deploy</goals>
         </configuration>
       </plugin>
@@ -69,12 +70,6 @@
   <profiles>
     <profile>
       <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>release</name>
-          <value>true</value>
-        </property>
-      </activation>
       <build>
         <plugins>
           <plugin>
diff --git a/util/pom.xml b/util/pom.xml
index ada0bc304b..c88785374a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -1,10 +1,8 @@
-<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">
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.kubernetes</groupId>
 	<artifactId>client-java-util</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>client-java-util</name>
 	<url>https://github.com/kubernetes-client/java</url>
@@ -12,7 +10,7 @@
 		<dependency>
 			<groupId>io.kubernetes</groupId>
 			<artifactId>client-java-api</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>