diff --git a/entrypoint.sh b/entrypoint.sh
index fbabcab2c8713812929159687e84008a20d5b123..bf47e8db584bcb059c40272a39a0c25fb456863d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -34,11 +34,12 @@ if [ ! -f /etc/apache2/saml2/${HOST}.xml ]; then
     pushd /etc/apache2/saml2
      echo -e "Generating new service provider certificate.\n\n" 
      /usr/sbin/mellon_create_metadata https://${HOST}/mellon/metadata https://${HOST}/mellon
+    mv http*.xml sp.xml
+    mv http*.key sp.key
+    mv http*.cert sp.cert
     popd
 fi
 
-sed -i "s/{{SP_ID}}/${HOST}/g" /etc/apache2/conf-enabled/mod_auth_mellon.conf
-
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
     until nc -z -v -w30 $DB_HOST $DB_PORT
diff --git a/mod_auth_mellon.conf b/mod_auth_mellon.conf
index 1bf0425ce359b825df49649cc39e04bcc50863ad..7b9b0ac8897216a1915dd16eea2cd91c06e2035d 100644
--- a/mod_auth_mellon.conf
+++ b/mod_auth_mellon.conf
@@ -1,9 +1,9 @@
 <Location / >
  MellonEnable info
  MellonEndpointPath /mellon
- MellonSPPrivateKeyFile /etc/apache2/saml2/{{SP_ID}}.key
- MellonSPCertFile       /etc/apache2/saml2/{{SP_ID}}.cert
- MellonSPMetadataFile   /etc/apache2/saml2/{{SP_ID}}.xml
+ MellonSPPrivateKeyFile /etc/apache2/saml2/sp.key
+ MellonSPCertFile       /etc/apache2/saml2/sp.cert
+ MellonSPMetadataFile   /etc/apache2/saml2/sp.xml
  MellonIdPMetadataFile  /etc/apache2/saml2/idp.xml
 </Location>