diff --git a/Dockerfile b/Dockerfile
index 7d90993..13af0df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM docker.inteligr8.com/inteligr8/java-dcevm-hotswap:${java-dcevm-hotswap.version}
+FROM docker.inteligr8.com/inteligr8/jdk-hotswap:${jdk-hotswap.version}
 
 # Configure the Apache Tomcat Catalina script
 ENV JAVA_MEMORY_INIT=128m
diff --git a/README.md b/README.md
index 4f723ec..2d7d893 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 # Apache Tomcat Application Container Image with Hot-Reloading
 
-This project creates a Docker image that has uses the [Java DCEVM Hotswap Docker Image](/inteligr8/java-dcevm-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
+This project creates a Docker image that has uses the [Java Hotswap Docker Image](/inteligr8/jdk-hotswap-docker) to support hot-reloading for the enablement of rapid application development.  As a Docker image, containers can be started to facilitate development without requiring complicated installations on developer workstations.
 
 It is expected that containers are configured in Maven using the Fabric8 or Spotify Docker plugins.  These configurations should expose the 8080 (HTTP) and 8000 (debugger) ports and any other port that the application may open.  Most importantly, it should mount/bind the source code to the following possible paths.
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 45ba6c4..2256618 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/jdk-hotswap-setenv.sh
 . /usr/local/bin/${namespace.prefix}-setenv.sh
 
 exec "$@"
diff --git a/pom.xml b/pom.xml
index 78c9be2..606b2b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.5</version>
+    <version>9-2.0</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.15-1.4.1</java-dcevm-hotswap.version>
+        <!-- The release version of the Java Hotswap Docker image -->
+        <!-- See: https://bitbucket.org/inteligr8/jdk-hotswap-docker -->
+        <jdk-hotswap.version>1.4.1-jbr-17.0.8</jdk-hotswap.version>
 
         <namespace.prefix>tomcat-rad</namespace.prefix>