diff --git a/create-cache-permanent/Dockerfile b/create-cache-permanent/Dockerfile
deleted file mode 100644
index 28f4984..0000000
--- a/create-cache-permanent/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM fabric8/java-jboss-openjdk8-jdk:1.2.3
-
-EXPOSE 8080
-
-# Copy dependencies
-COPY target/dependency/* /deployments/libs/
-
-ENV JAVA_APP_DIR=/deployments
-ENV JAVA_LIB_DIR=/deployments/libs
-ENV JAVA_CLASSPATH=${JAVA_APP_DIR}/classes:${JAVA_LIB_DIR}/*
-ENV JAVA_OPTIONS=""
-ENV JAVA_MAIN_CLASS="app.Main"
-
-# Copy classes
-COPY target/classes /deployments/classes
diff --git a/create-cache-permanent/build.sh b/create-cache-permanent/build.sh
index 82e0907..f08166d 100755
--- a/create-cache-permanent/build.sh
+++ b/create-cache-permanent/build.sh
@@ -8,8 +8,8 @@ oc project myproject
 APP=app
 
 # || true to make it idempotent
-oc new-build --binary --name=${APP} -l app=${APP} || true
+oc new-build --binary --strategy=source --name=${APP} -l app=${APP} fabric8/s2i-java:2.3 || true
 
-mvn -s settings.xml clean dependency:copy-dependencies compile -DincludeScope=runtime
+mvn -s settings.xml clean package -DincludeScope=runtime
 
-oc start-build ${APP} --from-dir=. --follow
+oc start-build ${APP} --from-dir=target/ --follow
diff --git a/create-cache-permanent/pom.xml b/create-cache-permanent/pom.xml
index fc0b016..1f95bc0 100644
--- a/create-cache-permanent/pom.xml
+++ b/create-cache-permanent/pom.xml
@@ -1,39 +1,59 @@
 <?xml version="1.0" encoding="UTF-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">
-   <modelVersion>4.0.0</modelVersion>
+<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>demo</groupId>
+  <artifactId>create-cache-permanent</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <version.infinispan>8.5.1.Final-redhat-1</version.infinispan>
+    <version.plugin.shade-maven>3.1.0</version.plugin.shade-maven>
+    <!-- JDG 7.2.1 -->
+  </properties>
 
-   <groupId>demo</groupId>
-   <artifactId>create-cache-permanent</artifactId>
-   <version>1.0-SNAPSHOT</version>
-
-   <properties>
-      <maven.compiler.target>1.8</maven.compiler.target>
-      <maven.compiler.source>1.8</maven.compiler.source>
-
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-      <version.infinispan>8.5.1.Final-redhat-1</version.infinispan> <!-- JDG 7.2.1 -->
-   </properties>
-
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-bom</artifactId>
-            <version>${version.infinispan}</version>
-            <scope>import</scope>
-            <type>pom</type>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
-   <dependencies>
+  <dependencyManagement>
+    <dependencies>
       <dependency>
-         <groupId>org.infinispan</groupId>
-         <artifactId>infinispan-client-hotrod</artifactId>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-bom</artifactId>
+        <version>${version.infinispan}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
-   </dependencies>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-client-hotrod</artifactId>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>${version.plugin.shade-maven}</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>app.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>