diff --git a/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml b/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
index fca4078..de42331 100644
--- a/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
+++ b/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
@@ -11,7 +11,7 @@
 
     <RequestMapper type="XML">
         <RequestMap>
-            <Host name="test.workbench.incommon.org">
+            <Host name="__CSPHOSTNAME__">
                 <Path name="midpoint" authType="shibboleth" requireSession="true"/>
                 <Path name="test" authType="shibboleth" requireSession="true"/>
             </Host>
diff --git a/Workbench/mpproxy/container_files/system/setservername.sh b/Workbench/mpproxy/container_files/system/setservername.sh
index 20b9d05..d6497c4 100755
--- a/Workbench/mpproxy/container_files/system/setservername.sh
+++ b/Workbench/mpproxy/container_files/system/setservername.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-files="/etc/shibboleth/idp-metadata.xml"
+files="/etc/shibboleth/idp-metadata.xml /etc/shibboleth/shibboleth2.xml"
 
 for file in $files
   do