diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index d0ff4618..99d6d216 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -67,6 +67,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -75,6 +76,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index 33916543..938f28b3 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -90,6 +90,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -98,6 +99,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index e3d4550d..3adcba9e 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -59,6 +59,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -67,6 +68,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/spring-cloud-kubernetes-integration-tests/README b/spring-cloud-kubernetes-integration-tests/README
index b45eb7c9..cb0827c8 100644
--- a/spring-cloud-kubernetes-integration-tests/README
+++ b/spring-cloud-kubernetes-integration-tests/README
@@ -13,14 +13,22 @@ you must name the image with the same name as the module. For example:
 	</configuration>
 	<executions>
 		<execution>
-			<configuration>
-				<skip>${skip.build.image}</skip>
-			</configuration>
-			<phase>package</phase>
-			<goals>
-				<goal>build-image</goal>
-			</goals>
-		</execution>
+           <id>build-image</id>
+           <configuration>
+              <skip>${skip.build.image}</skip>
+           </configuration>
+           <phase>package</phase>
+           <goals>
+              <goal>build-image</goal>
+           </goals>
+        </execution>
+        <execution>
+           <id>repackage</id>
+           <phase>package</phase>
+           <goals>
+              <goal>repackage</goal>
+           </goals>
+        </execution>
 	</executions>
 </plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml
index bb79e944..2b890d91 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml
@@ -94,6 +94,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -102,6 +103,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml
index 6acc8142..4b8751ba 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml
@@ -95,6 +95,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -103,6 +104,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml
index cc376e64..7e397ef6 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml
@@ -95,6 +95,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -103,6 +104,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml
index d78cd523..ab4d6b45 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml
@@ -89,6 +89,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -97,6 +98,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml
index e3cdffec..68e905b6 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml
@@ -89,6 +89,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -97,6 +98,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml
index 9f11a4b2..1871fb77 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml
@@ -123,6 +123,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -131,6 +132,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml
index e16a3e9d..e9144787 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml
@@ -72,6 +72,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -80,6 +81,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml
index 9441f884..7e9e22df 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml
@@ -78,6 +78,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -86,6 +87,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml
index 2924f2d0..729df4b6 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml
@@ -72,6 +72,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -80,6 +81,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml
index 998e5168..d5fe35a4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml
@@ -66,6 +66,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -74,6 +75,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml
index 6e1aa15d..1929199e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml
@@ -64,6 +64,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -72,6 +73,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index a934272a..fcad92cc 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -64,6 +64,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -72,6 +73,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml
index b5b99282..8f3110de 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml
@@ -66,6 +66,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -74,6 +75,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml
index b223b009..6a6d8eb9 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml
@@ -64,6 +64,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -72,6 +73,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml
index f6f7bd5c..d326b886 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml
@@ -64,6 +64,7 @@
 				</configuration>
 				<executions>
 					<execution>
+						<id>build-image</id>
 						<configuration>
 							<skip>${skip.build.image}</skip>
 						</configuration>
@@ -72,6 +73,13 @@
 							<goal>build-image</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>repackage</id>
+						<phase>package</phase>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>