diff --git a/Workbench/mpproxy/container_files/shibboleth/idp-metadata.xml b/Workbench/mpproxy/container_files/shibboleth/idp-metadata.xml
index 8bf0814..e069ccf 100644
--- a/Workbench/mpproxy/container_files/shibboleth/idp-metadata.xml
+++ b/Workbench/mpproxy/container_files/shibboleth/idp-metadata.xml
@@ -98,10 +98,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo=
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
 
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://__CSPHOSTNAME__/idp/profile/Shibboleth/SSO"/>
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__CSPHOSTNAME__/idp/profile/SAML2/POST/SSO"/>
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://__CSPHOSTNAME__/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://__CSPHOSTNAME__/idp/profile/SAML2/Redirect/SSO"/>
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://__SERVERNAME__/idp/profile/Shibboleth/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__SERVERNAME__/idp/profile/SAML2/POST/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://__SERVERNAME__/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://__SERVERNAME__/idp/profile/SAML2/Redirect/SSO"/>
 
     </IDPSSODescriptor>
 
@@ -192,8 +192,8 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo=
         </KeyDescriptor>
 
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://__CSPHOSTNAME__/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://__CSPHOSTNAME__/idp/profile/SAML2/SOAP/AttributeQuery"/> 
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://__SERVERNAME__/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://__SERVERNAME__/idp/profile/SAML2/SOAP/AttributeQuery"/> 
         <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
 
     </AttributeAuthorityDescriptor>
diff --git a/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml b/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
index de42331..39b51df 100644
--- a/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
+++ b/Workbench/mpproxy/container_files/shibboleth/shibboleth2.xml
@@ -11,9 +11,8 @@
 
     <RequestMapper type="XML">
         <RequestMap>
-            <Host name="__CSPHOSTNAME__">
+            <Host name="__SERVERNAME__">
                 <Path name="midpoint" authType="shibboleth" requireSession="true"/>
-                <Path name="test" authType="shibboleth" requireSession="true"/>
             </Host>
         </RequestMap>
     </RequestMapper>
diff --git a/Workbench/mpproxy/container_files/system/setservername.sh b/Workbench/mpproxy/container_files/system/setservername.sh
index d6497c4..9dbde01 100755
--- a/Workbench/mpproxy/container_files/system/setservername.sh
+++ b/Workbench/mpproxy/container_files/system/setservername.sh
@@ -4,6 +4,6 @@ files="/etc/shibboleth/idp-metadata.xml /etc/shibboleth/shibboleth2.xml"
 
 for file in $files
   do
-    sed -i "s|__CSPHOSTNAME__|$CSPHOSTNAME|g" $file
+    sed -i "s|__SERVERNAME__|$SERVERNAME|g" $file
   done