diff --git a/el8-builds/ngap/Dockerfile b/el8-builds/ngap/Dockerfile
index 2c937cc0..4b57d7ee 100644
--- a/el8-builds/ngap/Dockerfile
+++ b/el8-builds/ngap/Dockerfile
@@ -200,12 +200,10 @@ ENV PATH $CATALINA_HOME/bin:$PATH
 RUN set -e && echo "CATALINA_HOME: ${CATALINA_HOME}" >&2
 
 # Install our modified server.xml so that the server compresses responses.
-COPY tomcat9-server.xml /
-RUN set -e \
-    && mv /tomcat9-server.xml ${CATALINA_HOME}/conf/server.xml \
-    && chown -R tomcat:tomcat ${CATALINA_HOME}/conf/server.xml
+COPY tomcat9-server.xml ${CATALINA_HOME}/conf/server.xml
+RUN set -e && chown -R tomcat:tomcat ${CATALINA_HOME}/conf/server.xml
 
-# Tweak the mime-type for javascript. (@TODO Will this satisfy X-Content-Type-Options=nosniff issues?)
+# Modernize the mime-type for javascript. from text/javascript to application/javascript
 Run set -e \
     && sed -i 's+text/javascript+application/javascript+g' ${CATALINA_HOME}/conf/web.xml
 
diff --git a/el8-builds/ngap/tomcat9-server.xml b/el8-builds/ngap/tomcat9-server.xml
index 3cd50c7e..1f7473d1 100644
--- a/el8-builds/ngap/tomcat9-server.xml
+++ b/el8-builds/ngap/tomcat9-server.xml
@@ -118,6 +118,7 @@
         protocol="org.apache.coyote.http11.Http11AprProtocol"
         maxThreads="150"
         SSLEnabled="true"
+        secure="true"
         compression="force"
         compressionMinSize="2048"
         compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"
diff --git a/el9-builds/hyrax/Dockerfile b/el9-builds/hyrax/Dockerfile
index a9cc5edb..5cae914b 100644
--- a/el9-builds/hyrax/Dockerfile
+++ b/el9-builds/hyrax/Dockerfile
@@ -255,14 +255,6 @@ RUN set -e \
     && rm -fv "/$TOMCAT_DISTRO.tar.gz" \
     && echo "# Tomcat is unpacked and ready. >&2 "
 
-# @TODO REMOVE THIS COMMENTED OUT CODE BEFORE MERGE
-#COPY tomcat.service /etc/systemd/system/tomcat.service
-#RUN set -e \
-#    && which systemctl \
-#    && systemctl enable tomcat
-#RUN firewall-cmd --add-port 8080/tcp --permanent
-#RUN firewall-cmd --reload
-
 ENV CATALINA_HOME=/usr/share/tomcat
 ENV PATH=$CATALINA_HOME/bin:$PATH
 RUN set -e && echo "# CATALINA_HOME: $CATALINA_HOME" >&2
diff --git a/el9-builds/ngap/Dockerfile b/el9-builds/ngap/Dockerfile
index f65833f1..715c5bfe 100644
--- a/el9-builds/ngap/Dockerfile
+++ b/el9-builds/ngap/Dockerfile
@@ -332,26 +332,17 @@ RUN set -e \
     && chown -R tomcat:tomcat /var/log/tomcat /home/tomcat \
     && echo "# Tomcat is unpacked and ready. >&2 "
 
-# @TODO REMOVE THIS FOLLOWING COMMENTED OUT CODE BEFORE MERGE
-#COPY tomcat.service /etc/systemd/system/tomcat.service
-#RUN set -e \
-#    && echo "$HR2" >&2 \
-#    && echo "# Calling: 'systemctl enable tomcat'" >&2 \
-#    && echo "# $(systemctl enable tomcat)" >&2 \
-#    && echo "# systemctl status: $?" >&2 \
-#    && echo "$HR" >&2
-#RUN firewall-cmd --add-port 8080/tcp --permanent
-#RUN firewall-cmd --reload
-
 ENV CATALINA_HOME="/usr/share/tomcat"
 ENV PATH="$CATALINA_HOME/bin:$PATH"
 RUN set -e && echo "# CATALINA_HOME: $CATALINA_HOME" >&2
 
 # Install our modified server.xml so that the server compresses responses.
-COPY tomcat11-server.xml /
-RUN set -e \
-    && mv "/tomcat11-server.xml" "$CATALINA_HOME/conf/server.xml" \
-    && chown -R tomcat:tomcat "$CATALINA_HOME/conf/server.xml"
+COPY tomcat11-server.xml "$CATALINA_HOME/conf/server.xml"
+RUN set -e && chown -R tomcat:tomcat "$CATALINA_HOME/conf/server.xml"
+
+# Modernize the mime-type for javascript. from text/javascript to application/javascript
+Run set -e \
+    && sed -i 's+text/javascript+application/javascript+g' ${CATALINA_HOME}/conf/web.xml
 
 RUN set -e \
     && echo "Cleaning up Tomcat distribution files..." >&2 \
diff --git a/el9-builds/ngap/tomcat11-server.xml b/el9-builds/ngap/tomcat11-server.xml
index 80c71f77..b9adb7ba 100644
--- a/el9-builds/ngap/tomcat11-server.xml
+++ b/el9-builds/ngap/tomcat11-server.xml
@@ -118,6 +118,7 @@
         protocol="org.apache.coyote.http11.Http11NioProtocol"
         maxThreads="150"
         SSLEnabled="true"
+        secure="true"
         compression="force"
         compressionMinSize="2048"
         compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"