diff --git a/Dockerfile b/Dockerfile
index 77d208b..0570a16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=5.8.5 \
-    GROUPER_CONTAINER_VERSION=5.8.6 \
+ENV GROUPER_VERSION=5.8.7 \
+    GROUPER_CONTAINER_VERSION=5.8.7 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
diff --git a/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh b/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
index 0b1df4d..03c0f23 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestDaemon.sh
@@ -25,7 +25,6 @@ testContainerDaemon() {
   assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/lib/grouper-messaging-activemq-$grouperVersion.jar"
   assertFileExists "/opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/grouper-messaging-activemq-$grouperVersion.jar"
 
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -35,7 +34,6 @@ testContainerDaemon() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-daemon"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS "#"
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
index fd4afdb..ed38f5d 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
@@ -34,7 +34,6 @@ testContainerQuickstart() {
 
   assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper;"
 
-  assertEnvVar GROUPERWS_PROXY_PASS ""
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -44,7 +43,6 @@ testContainerQuickstart() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh b/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
index 2a707c1..7238d7e 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestSelfSigned.sh
@@ -22,9 +22,7 @@ testContainerSelfSigned() {
   assertEnvVar GROUPER_SSL_USE_CHAIN_FILE "false"
   assertEnvVar GROUPER_SSL_CERT_FILE "/etc/pki/tls/certs/localhost.crt"
   assertEnvVar GROUPER_SSL_KEY_FILE "/etc/pki/tls/private/localhost.key"
-  assertEnvVar GROUPER_SSL_USE_STAPLING "true"
 
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -34,7 +32,6 @@ testContainerSelfSigned() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ui"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_SELF_SIGNED_CERT "true"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi.sh b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
index bc75c24..017bda0 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUi.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
@@ -33,7 +33,6 @@ testContainerUi() {
   assertEnvVar GROUPER_SSL_CERT_FILE "/etc/pki/tls/certs/host-cert.pem"
   assertEnvVar GROUPER_SSL_KEY_FILE "/etc/pki/tls/private/host-key.pem"
   assertEnvVarNot GROUPER_SSL_CHAIN_FILE "/etc/pki/tls/certs/cachain.pem"
-  assertEnvVar GROUPER_SSL_USE_STAPLING "true"
 
   assertFileContains /opt/tomcat/conf/Catalina/localhost/grouper.xml 'cookies="true"'
 
@@ -52,7 +51,6 @@ testContainerUi() {
   assertFileContains /opt/tomcat/conf/server.xml "tomcatAuthentication"
 
   assertEnvVar GROUPER_TOMCAT_LOG_ACCESS "false"
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -62,7 +60,6 @@ testContainerUi() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ui"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi2.sh b/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
index cffe921..5067429 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUi2.sh
@@ -12,11 +12,11 @@ testContainerUi2() {
   echo
   echo '################'
   echo Running container as ui
-  echo "docker run --detach --name $containerName --publish 443:443 -e GROUPER_TOMCAT_MAX_HEADER_COUNT=1235 -e GROUPER_SSL_USE_STAPLING=false -e GROUPER_SSL_CERT_FILE=/a/b/cert -e GROUPER_SSL_KEY_FILE=/a/b/key -e GROUPER_SSL_CHAIN_FILE=/a/b/chain -e GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false $imageName ui"
+  echo "docker run --detach --name $containerName --publish 443:443 -e GROUPER_TOMCAT_MAX_HEADER_COUNT=1235 -e GROUPER_SSL_CERT_FILE=/a/b/cert -e GROUPER_SSL_KEY_FILE=/a/b/key -e GROUPER_SSL_CHAIN_FILE=/a/b/chain -e GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false $imageName ui"
   echo '################'
   echo
 
-  docker run --detach --name $containerName --publish 443:443 -e GROUPER_TOMCAT_MAX_HEADER_COUNT=1235 -e GROUPER_SSL_USE_STAPLING=false -e GROUPER_SSL_CERT_FILE=/a/b/cert -e GROUPER_SSL_KEY_FILE=/a/b/key -e GROUPER_SSL_CHAIN_FILE=/a/b/chain -e GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false $imageName ui
+  docker run --detach --name $containerName --publish 443:443 -e GROUPER_TOMCAT_MAX_HEADER_COUNT=1235 -e GROUPER_SSL_CERT_FILE=/a/b/cert -e GROUPER_SSL_KEY_FILE=/a/b/key -e GROUPER_SSL_CHAIN_FILE=/a/b/chain -e GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false $imageName ui
   sleep $globalSleepSecondsAfterRun
 
 
@@ -36,7 +36,6 @@ testContainerUi2() {
   assertEnvVar GROUPER_SSL_CERT_FILE "/a/b/cert"
   assertEnvVar GROUPER_SSL_KEY_FILE "/a/b/key"
   assertEnvVar GROUPER_SSL_CHAIN_FILE "/a/b/chain"
-  assertEnvVar GROUPER_SSL_USE_STAPLING "false"
 
   assertNumberOfTomcatProcesses 1
 
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh b/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
index 6ebffef..1cb9e83 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiNoSsl.sh
@@ -24,7 +24,6 @@ testContainerUiNoSsl() {
   assertFileNotContains /opt/tomcat/conf/server.xml "maxHeaderCount"
 
   assertEnvVar GROUPER_TOMCAT_LOG_ACCESS "true"
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -34,7 +33,6 @@ testContainerUiNoSsl() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ui"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh b/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
index 7c4355d..7f9cb83 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiSubimage.sh
@@ -44,7 +44,6 @@ testContainerUiSubimage() {
   assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties grouperPasswordConfigOverride_UI_GrouperSystem_pass.elConfig
   assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties thisPassIsCopyrightedDontUse
 
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -54,7 +53,6 @@ testContainerUiSubimage() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ui"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh b/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
index 88925c2..3ea7cb8 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
@@ -45,7 +45,6 @@ testContainerUiSubimageNonroot() {
   assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties grouperPasswordConfigOverride_UI_GrouperSystem_pass.elConfig
   assertFileNotContains /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties thisPassIsCopyrightedDontUse
 
-  assertEnvVar GROUPERWS_PROXY_PASS "#"
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVarNot GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -55,7 +54,6 @@ testContainerUiSubimageNonroot() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ui"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS ""
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestWs.sh b/container_files/tier-support/test/grouperContainerUnitTestWs.sh
index 3afd3ea..3bfabf5 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestWs.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestWs.sh
@@ -34,7 +34,6 @@ testContainerWs() {
 
   assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper-ws;"
 
-  assertEnvVar GROUPERWS_PROXY_PASS ""
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -44,7 +43,6 @@ testContainerWs() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ws"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS "#"
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper-ws"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh b/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
index 5d82042..328edcb 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestWsAuthn.sh
@@ -34,7 +34,6 @@ testContainerWsAuthn() {
 
   assertFileContains /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml "grouper-ws;"
 
-  assertEnvVar GROUPERWS_PROXY_PASS ""
   assertEnvVar GROUPERWS_URL_CONTEXT "grouper-ws"
   assertEnvVar GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
@@ -44,7 +43,6 @@ testContainerWsAuthn() {
   assertEnvVar GROUPER_HOME "/opt/grouper/grouperWebapp/WEB-INF"
   assertEnvVar GROUPER_LOG_PREFIX "grouper-ws"
   assertEnvVar GROUPER_MAX_MEMORY "1500m"
-  assertEnvVar GROUPER_PROXY_PASS "#"
   assertEnvVar GROUPER_RUN_PROCESSES_AS_USERS "true"
   assertEnvVar GROUPER_RUN_TOMCAT "true"
   assertEnvVar GROUPER_TOMCAT_CONTEXT "grouper-ws"
diff --git a/container_files/tomcat/conf/server.xml.grouper b/container_files/tomcat/conf/server.xml.grouper
index 30cd465..3417a8b 100644
--- a/container_files/tomcat/conf/server.xml.grouper
+++ b/container_files/tomcat/conf/server.xml.grouper
@@ -173,7 +173,7 @@
 
         <!--GROUPER_TOMCAT_REMOTE_IP_VALVE-->
 
-        <Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
+        <!--GROUPER_TOMCAT_REWRITE_VALVE-->
 
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
index abccd79..e645331 100644
--- a/container_files/usr-local-bin/libraryPrep.sh
+++ b/container_files/usr-local-bin/libraryPrep.sh
@@ -76,35 +76,6 @@ prep_ui() {
     fi
 }
 
-prep_runUi() {
-  if [ -z "$GROUPER_PROXY_PASS" ]
-    then
-      if [ "$GROUPER_UI" == 'true' ]
-        then
-          echo "grouperContainer; INFO: (libraryPrep.sh-prep_runUi) export GROUPER_PROXY_PASS="    
-          export GROUPER_PROXY_PASS=
-        else
-          echo "grouperContainer; INFO: (libraryPrep.sh-prep_runUi) export GROUPER_PROXY_PASS=#"    
-          export GROUPER_PROXY_PASS=#
-      fi
-    
-  fi
-}
-prep_runWs() {
-  if [ -z "$GROUPERWS_PROXY_PASS" ]
-    then
-      if [ "$GROUPER_WS" == 'true' ]
-        then
-          echo "grouperContainer; INFO: (libraryPrep.sh-prep_runWs) export GROUPER_PROXY_PASS="    
-          export GROUPERWS_PROXY_PASS=
-        else
-          echo "grouperContainer; INFO: (libraryPrep.sh-prep_runWs) export GROUPER_PROXY_PASS=#"    
-          export GROUPERWS_PROXY_PASS=#
-      fi
-    
-  fi
-}
-
 prep_ws() {
 
     if [ -z "$GROUPER_WS" ]; then 
@@ -260,12 +231,6 @@ prep_finishBegin() {
         fi
       
       fi
-      if [ -z "$GROUPER_SSL_USE_STAPLING" ] ; then 
-
-        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_USE_STAPLING=true"
-        export GROUPER_SSL_USE_STAPLING=true
-      
-      fi
       
     fi
     if [ -z "$GROUPER_WEBCLIENT_IS_SSL" ] ; then 
@@ -401,15 +366,8 @@ prep_finishEnd() {
       export GROUPER_TOMCAT_REMOTE_IP_VALVE=false
     fi
     if [ -z "$GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER" ]; then 
-      if [ "$GROUPER_PROXY_PASS" = "#" ]; then 
-    
-        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false"
-        export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=false
-      else
-        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=true"
-        export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=true
-      
-      fi
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=true"
+      export GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER=true
     
     fi
 
@@ -431,9 +389,6 @@ prep_finish() {
 
     prepOnly    
 
-    prep_runUi
-    prep_runWs
-
     prep_finishEnd
     
     grouperScriptHooks_finishPrepPost
@@ -456,8 +411,6 @@ prep_unsetAll() {
   unset -f prep_initDeprecatedEnvVars
   unset -f prep_openshift
   unset -f prep_quickstart
-  unset -f prep_runUi
-  unset -f prep_runWs
   unset -f prep_unsetAll
   unset -f prep_unsetAllAndFromFiles
   unset -f prep_ui
@@ -474,8 +427,6 @@ prep_exportAll() {
   export -f prep_initDeprecatedEnvVars
   export -f prep_openshift
   export -f prep_quickstart
-  export -f prep_runUi
-  export -f prep_runWs
   export -f prep_unsetAll
   export -f prep_unsetAllAndFromFiles
   export -f prep_ui
diff --git a/container_files/usr-local-bin/librarySetupFilesTomcat.sh b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
index 2b34e33..42d0938 100644
--- a/container_files/usr-local-bin/librarySetupFilesTomcat.sh
+++ b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
@@ -20,29 +20,38 @@ setupFilesTomcat() {
 
 setupFilesTomcat_rewriteValve() {
 
-  if [ ! -f /opt/tomcat/conf/Catalina/localhost/rewrite.config ]; then 
+  if [ "$GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER" ] ; then 
     if [ "$GROUPER_UI" = "true" ]; then
-      mv /opt/tomcat/conf/Catalina/localhost/rewrite.config.grouper /opt/tomcat/conf/Catalina/localhost/rewrite.config
-      returnCode=$?
-      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) mv /opt/tomcat/conf/Catalina/localhost/rewrite.config.grouper /opt/tomcat/conf/Catalina/localhost/rewrite.config, result: $returnCode"
-      if [ $returnCode != 0 ]; then exit $returnCode; fi
+      if [ ! -f /opt/tomcat/conf/Catalina/localhost/rewrite.config ] ; then
+        mv /opt/tomcat/conf/Catalina/localhost/rewrite.config.grouper /opt/tomcat/conf/Catalina/localhost/rewrite.config
+        returnCode=$?
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) mv /opt/tomcat/conf/Catalina/localhost/rewrite.config.grouper /opt/tomcat/conf/Catalina/localhost/rewrite.config, result: $returnCode"
+        if [ $returnCode != 0 ]; then exit $returnCode; fi
+
+        sed -i "s|__CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /opt/tomcat/conf/Catalina/localhost/rewrite.config 
+        returnCode=$?
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) sed -i \"s|__CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g\" /opt/tomcat/conf/Catalina/localhost/rewrite.config, result: $returnCode"
+        if [ $returnCode != 0 ]; then exit $returnCode; fi
+
+      fi
       
-      sed -i "s|__CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /opt/tomcat/conf/Catalina/localhost/rewrite.config 
+      sed -i 's|<!--GROUPER_TOMCAT_REWRITE_VALVE-->|<Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />|g' /opt/tomcat/conf/server.xml 
       returnCode=$?
-      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) sed -i \"s|__CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g\" /opt/tomcat/conf/Catalina/localhost/rewrite.config, result: $returnCode"
+      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) Apply remote IP valve: sed -i 's|<!--GROUPER_TOMCAT_REWRITE_VALVE-->|<Valve className=\"org.apache.catalina.valves.rewrite.RewriteValve\" />|g' /opt/tomcat/conf/server.xml, result: $returnCode"
       if [ $returnCode != 0 ]; then exit $returnCode; fi
       
-    else
-      touch /opt/tomcat/conf/Catalina/localhost/rewrite.config
-      returnCode=$?
-      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_rewriteValve) touch /opt/tomcat/conf/Catalina/localhost/rewrite.config, result: $returnCode"
-      if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi
   
   fi
 }
     
 
+        
+
+        <!---->
+
+
+
 setupFilesTomcat_remoteIpValve() {
 
   if [ "$GROUPER_TOMCAT_REMOTE_IP_VALVE" = "true" ]; then