diff --git a/Dockerfile b/Dockerfile
index 1453cde..7d90993 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,14 +26,14 @@ RUN cd /var/lib/tomcat/dev && \
         mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7
 
 # Add our Docker container initialization script
-ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
-COPY docker-entrypoint.sh /usr/local/bin
+ADD maven/target/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh
+COPY maven/target/docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 # Add our Apache Tomcat configuration
 #   This gives us dynamic injection points into the running webapps
-COPY tomcat-context.xml /var/lib/tomcat/conf/context.xml
-ADD hotswap-agent.properties /var/lib/tomcat/lib
+COPY maven/target/tomcat-context.xml /var/lib/tomcat/conf/context.xml
+ADD maven/target/hotswap-agent.properties /var/lib/tomcat/lib
 
 # Listening for HTTP (not HTTPS) traffic
 EXPOSE 8080
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0642437..45ba6c4 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 . /usr/local/bin/java-dcevm-hotswap-setenv.sh
-. /usr/local/bin/tomcat-rad-setenv.sh
+. /usr/local/bin/${namespace.prefix}-setenv.sh
 
 exec "$@"
diff --git a/pom.xml b/pom.xml
index 921feaa..78c9be2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,20 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.4</version>
+    <version>9-1.5</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
     <properties>
         <!-- The release version of the Java DCEVM Hotswap Docker image -->
         <!-- See: https://bitbucket.org/inteligr8/java-dcevm-hotswap-docker -->
-        <java-dcevm-hotswap.version>11.0.11-1.4.1</java-dcevm-hotswap.version>
+        <java-dcevm-hotswap.version>11.0.15-1.4.1</java-dcevm-hotswap.version>
+
+        <namespace.prefix>tomcat-rad</namespace.prefix>
 
         <!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
         <!-- See: https://tomcat.apache.org/download-90.cgi -->
-        <tomcat.version>9.0.46</tomcat.version>
+        <tomcat.version>9.0.80</tomcat.version>
         <tomcat.majorVersion>9</tomcat.majorVersion>
         <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>
 
@@ -25,12 +27,39 @@
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>*.sh</include>
+                    <include>*.properties</include>
+                    <include>*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>resources</goal></goals>
+                        <configuration>
+                            <encoding>utf-8</encoding>
+                            <propertiesEncoding>utf-8</propertiesEncoding>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin build and pushes the Docker image -->
             <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>fabric8-maven-plugin</artifactId>
-                <version>4.4.0</version>
+                <groupId>org.eclipse.jkube</groupId>
+                <artifactId>kubernetes-maven-plugin</artifactId>
+                <version>1.14.0</version>
                 <configuration>
                     <images>
                         <image>
@@ -60,7 +89,7 @@
             <!-- This plugin prevents the project from deploying to the Maven Repository, as it is pointless -->
             <plugin>
             	<artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.1.1</version>
             	<configuration>
             		<skip>true</skip>
             	</configuration>