diff --git a/Dockerfile b/Dockerfile
index 1453cde..921b149 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ 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-bootstrap.sh /usr/local/bin/${project.artifactId}-setenv-bootstrap.sh
 ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
 COPY docker-entrypoint.sh /usr/local/bin
 RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0642437..92a5b25 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+. /usr/local/bin/tomcat-rad-setenv-bootstrap.sh
 . /usr/local/bin/java-dcevm-hotswap-setenv.sh
 . /usr/local/bin/tomcat-rad-setenv.sh
 
diff --git a/hotswap-agent.properties b/hotswap-agent.properties
index 562428d..3ebcf0e 100644
--- a/hotswap-agent.properties
+++ b/hotswap-agent.properties
@@ -52,7 +52,7 @@ webappDir=/var/lib/tomcat/dev/web
 
 # Comma separated list of disabled plugins
 # Use plugin name - e.g. Hibernate, Spring, ZK, Hotswapper, AnonymousClassPatch, Tomcat, Logback ....
-disabledPlugins=Hibernate
+disabledPlugins=${hotswap.disabledPlugins}
 
 # Watch for changed class files on watchResources path and reload class definition in the running application.
 #
diff --git a/pom.xml b/pom.xml
index 7af6a49..921feaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.inteligr8</groupId>
     <artifactId>tomcat-rad</artifactId>
-    <version>9-1.3</version>
+    <version>9-1.4</version>
     <name>Apache Tomcat for Rapid Application Development</name>
     <packaging>pom</packaging>
 
diff --git a/setenv-bootstrap.sh b/setenv-bootstrap.sh
new file mode 100644
index 0000000..1d09c94
--- /dev/null
+++ b/setenv-bootstrap.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+DISABLE_HOTSWAP_PLUGINS=Hibernate