diff --git a/shibauth/Dockerfile b/shibauth/Dockerfile
index 986fbddc6607750b7f4195b87fe7d1e051e5a531..3f278c2639eecace5c4a18e1ddf4e92f06f5ddd9 100644
--- a/shibauth/Dockerfile
+++ b/shibauth/Dockerfile
@@ -37,4 +37,3 @@ LABEL name="prism view server cache" \
 COPY shibboleth-conf /etc/shibboleth/
 COPY etc-httpd/ /etc/httpd/
 COPY index.html /var/www/html/
-
diff --git a/shibauth/etc-httpd/conf.d/shib.conf b/shibauth/etc-httpd/conf.d/shib.conf
deleted file mode 100644
index 2c7d35d23eccd1aa23f81b8bffa4542dfd28d4fc..0000000000000000000000000000000000000000
--- a/shibauth/etc-httpd/conf.d/shib.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ServerName shib.pdas.prism.eox.at
-LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so
-<Location /Shibboleth.sso>
-  SetHandler shib
-</Location>
-DocumentRoot "/var/www/html"
\ No newline at end of file
diff --git a/shibauth/etc-httpd/conf.d/sp.conf b/shibauth/etc-httpd/conf.d/sp.conf
new file mode 100644
index 0000000000000000000000000000000000000000..9de6cc7a59882ee8f4a4ca4772ba2d79b1c0bd41
--- /dev/null
+++ b/shibauth/etc-httpd/conf.d/sp.conf
@@ -0,0 +1,19 @@
+ServerName shib.pdas.prism.eox.at
+
+<VirtualHost *:80>
+    ServerName https://shib.pdas.prism.eox.at:443
+    UseCanonicalName On
+
+    DocumentRoot "/var/www/html"
+
+    <Location />
+        AuthType shibboleth
+        ShibRequestSetting requireSession 1
+        require shib-session
+    </Location>
+
+    <Location /Shibboleth.sso>
+      Satisfy Any
+      Allow from all
+    </Location>
+</VirtualHost>
\ No newline at end of file
diff --git a/shibauth/shibboleth-conf/shibboleth2.xml b/shibauth/shibboleth-conf/shibboleth2.xml
index 2769ec5fee1dad6a16e5eb616c7ff28a52bed445..8a916cfb9c8959c28d4b0bf88bb9d3469d19a381 100644
--- a/shibauth/shibboleth-conf/shibboleth2.xml
+++ b/shibauth/shibboleth-conf/shibboleth2.xml
@@ -8,7 +8,7 @@
                          REMOTE_USER="eppn uid persistent-id targeted-id">
         <Sessions lifetime="28800" timeout="3600" relayState="ss:mem"
                   checkAddress="false" handlerSSL="true" cookieProps="https">
-            <SSO entityID="https://idptestbed/idp/shibboleth">
+            <SSO entityID="https://samltest.id/saml/idp">
               SAML2 SAML1
             </SSO>
             <Logout>SAML2 Local</Logout>