diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile
index 6f5deb0..9bd5a4e 100644
--- a/Workbench/comanage/Dockerfile
+++ b/Workbench/comanage/Dockerfile
@@ -33,10 +33,10 @@ ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME
LABEL Version=$version
ENV VERSION=$version
-COPY container_files/shibboleth/idp-metadata.xml /etc/shibboleth/
+COPY container_files/shibboleth/* /etc/shibboleth/
COPY container_files/system/setservername.sh /usr/local/bin/
-RUN chmod 755 /usr/local/bin/setservername.sh
+RUN chmod 755 /usr/local/bin/setservername.sh && rm -f /etc/httpd/conf.d/ssl.conf
#set hostname
RUN /usr/local/bin/setservername.sh
diff --git a/Workbench/comanage/container_files/shibboleth/shibboleth2.xml b/Workbench/comanage/container_files/shibboleth/shibboleth2.xml
new file mode 100644
index 0000000..3991d24
--- /dev/null
+++ b/Workbench/comanage/container_files/shibboleth/shibboleth2.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SAML2
+
+
+
+ SAML2 Local
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Workbench/comanage/container_files/shibboleth/sp-encrypt-cert.pem b/Workbench/comanage/container_files/shibboleth/sp-encrypt-cert.pem
new file mode 100644
index 0000000..d3c288c
--- /dev/null
+++ b/Workbench/comanage/container_files/shibboleth/sp-encrypt-cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID6zCCAlOgAwIBAgIJAIB4eHZ1M1ByMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDDdjZjI3NzhiZWIxNTAeFw0yMDEwMzExODA4NDVaFw0zMDEwMjkxODA4NDVa
+MBcxFTATBgNVBAMTDDdjZjI3NzhiZWIxNTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+ADCCAYoCggGBAOPMP1n+c6q6IdujWWvW0/kW3if2rmk9WfHAxvLyguJCP1W3kMwV
+CZMKky8+26zcHX2PvdEHwJsrjDltsg73ZAnZYYFXTPh7JY3W1bAoRuywvUmyUIel
+tjH03d+riKaE4eqaCgPqyJaI2zLxNJHwCmr6FjLZ5cj8GatPQeNf0WPSnQonk8NW
+3eAWvOIeqS9w3bNfpIpP/mw49M9m6LbwH1VKEPHJDUY952fqWIJBSGDfrzCCftsl
+xQ9m7DrKARUfSFjwu3uTunKZAzkhVX/DWQ9SnyTADIfD5fgFq3wVIFmXTFLIWaWS
+Yr03qGs2XcDKkfoRcBXEWyQKp3zfxjCRks1Nr6cqdPyyJvZW6OVigbrMQP23CQca
+dinD0I1bpAMW/hIMWI3HPu/Cxli8GM3/03u5XDvTBrSXxmXncNCrAQBAYhZ9vrIc
+nqyGS8lTnzsNNZXzPK3dsJvBNE4ogk/MK4Cg9bBieyBZz0IZR46EnI7qVsycIGHy
+ttv2xyZ05sMgTQIDAQABozowODAXBgNVHREEEDAOggw3Y2YyNzc4YmViMTUwHQYD
+VR0OBBYEFKdOek6UqVa8xmmBFcz5pizhCEQgMA0GCSqGSIb3DQEBCwUAA4IBgQDK
+qFQyjhO6PVjHWy3PyhaXuCQ3UTyMEr1ZUY4nYZd2eIJXMssLpxzVAu93aWowDmNO
+m2bg5MI0agNUhly7zs+cbepkH9r32Z/c5H1fuJs1iuPdfZb4xPKic2or0Kx6n8eq
+NNZBPBXnb1ulEOWokn3PaaNPLHWk23k0SmgXHp5ibpWKpETO+Py3dnMjRzCTJeY1
+M2B+ovMgNK1otlK+IV3GPMNEkMeUa/uX/IjW+YlhhUqvL9b/lWdLY4D7ZL7F2Ieq
+u4Kb1ezOTjZ0A/8oVbTK8MXHNCouwVtPl00jsSHchIHDAz/iB524Eve/ayeV0KWd
+n8+t02stqKPqiS1wzM+zatgINaCTDQOEaq6TeRy423xoBps8yBF7qPPEIBwsI9Hv
+HNUq5NfIHltpt9TfbfHWRr4S/Ccslyi14gpNFZQO7mmuAZdUPGd/m4GzdGd9lFmz
+IvRCNeI0FpjTvdt4stm66ZqRfH8Ww+hzCHtDz6MBBRIl5uRaYPqakjsW6/UK7hs=
+-----END CERTIFICATE-----
diff --git a/Workbench/comanage/container_files/shibboleth/sp-encrypt-key.pem b/Workbench/comanage/container_files/shibboleth/sp-encrypt-key.pem
new file mode 100644
index 0000000..3bfdafe
--- /dev/null
+++ b/Workbench/comanage/container_files/shibboleth/sp-encrypt-key.pem
@@ -0,0 +1,40 @@
+-----BEGIN PRIVATE KEY-----
+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
+SnL+ZAlsa3/NQWPBfOqIWNc=
+-----END PRIVATE KEY-----
diff --git a/Workbench/comanage/container_files/shibboleth/sp-signing-cert.pem b/Workbench/comanage/container_files/shibboleth/sp-signing-cert.pem
new file mode 100644
index 0000000..c5a4988
--- /dev/null
+++ b/Workbench/comanage/container_files/shibboleth/sp-signing-cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID6zCCAlOgAwIBAgIJAPeLX7GZ1mdUMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDDdjZjI3NzhiZWIxNTAeFw0yMDEwMzExODA3MjVaFw0zMDEwMjkxODA3MjVa
+MBcxFTATBgNVBAMTDDdjZjI3NzhiZWIxNTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+ADCCAYoCggGBAJmgdbLZgwGaITfXZdIUpTuujVf+IPzvUgxyAmsyECJSAzLEYpvy
+AUEymK3NgGdfM9kYvaHqwNSzZgsLG+24fWtim3e4ksVJOV1ZOYdpe8+6Kbd6bMOp
+3Xc2BQYeMCZ/daP+v7i8UCiFQQr5qECfYkHli6WpOYlyCMFOa6hzLoEcuakLQz6k
+o4Hf5zN/lemKZ8M1YHJcAMmCjYCwxtzJsHAvJWS1rTQIafoWyOYVNl0nwf+NJlNp
+StWcYb6O7DBmxO9mec4rQ8yp9pi2WqUL9Eha2/P7VNJVDvO32SdWQiCXKSxdZ+vi
+nSOA1BfgcAJkePl21FKHFVQzjtC7wl/u3DVSk+Pbq5gm7jOS1Rh9EYmoNRzV/jbX
+jp8RJlxTABIKNNeD0qvtJ1vImEzXCaa9elnSmcbNlmcFK3izHBffrqk08LS6Nh5S
+//yFX+OObEI0kIdLjuHwgml+DeiWyOJi8ca98gps2Pph4A2xAYu3khE9pFdAe8Mo
+1O5FhRmzJteYnwIDAQABozowODAXBgNVHREEEDAOggw3Y2YyNzc4YmViMTUwHQYD
+VR0OBBYEFHHqoc9SPoSYSC1aF2hDAzzu+qogMA0GCSqGSIb3DQEBCwUAA4IBgQBh
+AtP/C43KuGIngpn8Bz9/iJocNmvUqZd3UonEFP9+ThW147HGK+FNeOCUSAFr5TKD
++J/NkfZ9u3uLRd6vYP6WBwgEXivjac8cyQwKwPAsE0ottO8A6lmc5rf2rsw/e1nj
+QGjKMIAwo4n8/H8mcTRmY3zP9DmevfyXbimNZpXHUIGbqUWLwMZRPRjBNajG3R8A
+SSXfuPqSe6Vu52cfPtELcInHTBTo2B1yYtqk/xlFMUxM4HT+JqZpiXFGV+0cxSoD
+Z4RijtBi/B2Oqy5xHaHM/Me0pQtuKz0JtEw3IUNKIU/nVCryLNU8uGJC7nEJF4aW
+JF7ErYSEwvCCjm2GH3tmkeguNZN4sc+ah6spA5AazakzXJntMVac42OKjDsqfxKA
+fdY5ejYiTq+4q0qCan7CjHcKy0y6wTUakLhHyHXFOrJu6hrWC1Tm68i41yrIj9sJ
+6fGzRN1eZFSaq95Sc2nq6xrUE6ldgu6udIDeCfn7y+a3N0RTaUhgPjylglOB9aU=
+-----END CERTIFICATE-----
diff --git a/Workbench/comanage/container_files/shibboleth/sp-signing-key.pem b/Workbench/comanage/container_files/shibboleth/sp-signing-key.pem
new file mode 100644
index 0000000..915002a
--- /dev/null
+++ b/Workbench/comanage/container_files/shibboleth/sp-signing-key.pem
@@ -0,0 +1,40 @@
+-----BEGIN PRIVATE KEY-----
+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
+ECX4/movLrhpXT8i3sM/E7Kq
+-----END PRIVATE KEY-----
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index 43c3b17..f503cc4 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -12,7 +12,7 @@
Welcome to the InCommon TAP Workbench!
Shibboleth SP
Grouper
midPoint
-COmanage
+COmanage
In addition, the following applications are available:
diff --git a/Workbench/webproxy/container_files/httpd/proxy.conf b/Workbench/webproxy/container_files/httpd/proxy.conf
index 4530105..bb6ec23 100644
--- a/Workbench/webproxy/container_files/httpd/proxy.conf
+++ b/Workbench/webproxy/container_files/httpd/proxy.conf
@@ -38,6 +38,5 @@ ProxyPassReverse /ldapadmin https://directory/ldapadmin
ProxyPass /phpmyadmin https://directory/phpmyadmin
ProxyPassReverse /phpmyadmin https://directory/phpmyadmin
-ProxyPass /comanage https://comanage/
-ProxyPassReverse /comanage https://comanage/
-
+ProxyPass /registry https://comanage/registry
+#ProxyPassReverse /comanage https://comanage/