diff --git a/docker-compose.yml b/docker-compose.yml
index a3bb45f..3598a45 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   db:
     image: mariadb:10.4
@@ -98,4 +97,4 @@ services:
       - SHIB_ODBC_PASSWORD=password
       - SHIBD_ATTRIBUTE_MAP_URL=
     volumes:
-      - ./.data/cert:/etc/shibboleth/cert:rw
\ No newline at end of file
+      - ./.data/cert:/etc/shibboleth/cert:rw
diff --git a/docker-entrypoint.d/shib b/docker-entrypoint.d/shib
index 59a3dce..5f1912e 100644
--- a/docker-entrypoint.d/shib
+++ b/docker-entrypoint.d/shib
@@ -4,6 +4,7 @@ set -e
 if [[ -z "${SHIBBOLETH_SP_ENTITY_ID}" ]]; then
   # disable mod_shib
   a2dismod shib
+  rm /etc/apache2/conf-enabled/shib.conf /etc/apache2/conf-enabled/moodle-shib.conf
 else
   export SHIBD_SERVICE_IP=`getent hosts ${SHIBD_SERVICE_NAME} | awk '{ print $1  }'`