diff --git a/Dockerfile b/Dockerfile
index 328847f..55bd5b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,12 +34,12 @@ RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
         mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7
 
 # Add our Docker container initialization scripts
-ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
-ADD maven/target/docker-entrypoint.sh /usr/local/bin
+ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+ADD maven/target/resources/docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 # Add our default hotswap configuration; may be overwritten in dev/classes* volumes
-ADD maven/target/hotswap-agent.properties /var/lib/jvm/lib
+ADD maven/target/resources/hotswap-agent.properties /var/lib/jvm/lib
 
 # Listening for Java debugger traffic
 EXPOSE 8000
diff --git a/pom.xml b/pom.xml
index a340940..3fe55d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,13 +35,9 @@
     <build>
         <resources>
             <resource>
-                <directory>.</directory>
-                <includes>
-                    <include>*.sh</include>
-                    <include>*.properties</include>
-                </includes>
+                <directory>src/main/docker</directory>
                 <filtering>true</filtering>
-                <targetPath>${project.build.directory}</targetPath>
+                <targetPath>${project.build.directory}/resources</targetPath>
             </resource>
         </resources>
         <plugins>
@@ -64,7 +60,7 @@
             <plugin>
                 <groupId>org.eclipse.jkube</groupId>
                 <artifactId>kubernetes-maven-plugin</artifactId>
-                <version>1.18.0</version>
+                <version>1.16.2</version>
                 <configuration>
                     <images>
                         <image>
@@ -72,7 +68,8 @@
                             <registry>${image.registry}</registry>
                         </image>
                     </images>
-                    <contextDir>${project.build.directory}</contextDir>
+                    <contextDir>${project.build.directory}/resources</contextDir>
+                    <dockerFile>${project.basedir}/Dockerfile</dockerFile>
                     <verbose>true</verbose>
                 </configuration>
                 <executions>
diff --git a/docker-entrypoint.sh b/src/main/docker/docker-entrypoint.sh
similarity index 100%
rename from docker-entrypoint.sh
rename to src/main/docker/docker-entrypoint.sh
diff --git a/hotswap-agent.properties b/src/main/docker/hotswap-agent.properties
similarity index 100%
rename from hotswap-agent.properties
rename to src/main/docker/hotswap-agent.properties
diff --git a/setenv.sh b/src/main/docker/setenv.sh
similarity index 100%
rename from setenv.sh
rename to src/main/docker/setenv.sh