diff --git a/Dockerfile b/Dockerfile
index accafe38ed798e68c09a90f1bb1747ec74a13760..97190436e2342de7da45ac1bd8c335edd169c7f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
         chown -R www-data:www-data /var/www/html
 
 COPY entrypoint.sh entrypoint.sh
-ADD mod_auth_mellon.conf /etc/apache2/conf.d/mod_auth_mellon.conf
+ADD mod_auth_mellon.conf /etc/apache2/conf-enabled/mod_auth_mellon.conf
 
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 86990214bd39e7235b61a91dc623bb456e3abe38..3b2e71241772a437475b9db712426628b90d7c6c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -38,7 +38,7 @@ if [ ! -f /etc/apache2/saml2/${SP_ID}.xml ]; then
     popd
 fi
 
-sed -i "s/{{SP_ID}}/${SP_ID}/g" /etc/apache2/conf.d/mod_auth_mellon.conf
+sed -i "s/{{SP_ID}}/${SP_ID}/g" /etc/apache2/conf-enabled/mod_auth_mellon.conf
 
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then