diff --git a/docker-compose.dev.yml b/example/authelia/docker-compose.dev.yml
similarity index 65%
rename from docker-compose.dev.yml
rename to example/authelia/docker-compose.dev.yml
index 1290afd1..01554629 100644
--- a/docker-compose.dev.yml
+++ b/example/authelia/docker-compose.dev.yml
@@ -2,9 +2,7 @@ version: '2'
 services:
   authelia:
     volumes:
-      - ./test:/usr/src/test
       - ./dist/server:/usr/src/server
       - ./dist/shared:/usr/src/shared
-      - ./config.template.yml:/etc/authelia/config.yml:ro
     networks:
       - example-network
diff --git a/example/authelia/docker-compose.yml b/example/authelia/docker-compose.dockerhub.yml
similarity index 100%
rename from example/authelia/docker-compose.yml
rename to example/authelia/docker-compose.dockerhub.yml
diff --git a/docker-compose.test.yml b/example/authelia/docker-compose.test.yml
similarity index 100%
rename from docker-compose.test.yml
rename to example/authelia/docker-compose.test.yml
diff --git a/docker-compose.base.yml b/example/docker-compose.base.yml
similarity index 100%
rename from docker-compose.base.yml
rename to example/docker-compose.base.yml
diff --git a/scripts/dc-dev.sh b/scripts/dc-dev.sh
index 75b6ba6a..cbee1a13 100755
--- a/scripts/dc-dev.sh
+++ b/scripts/dc-dev.sh
@@ -3,9 +3,9 @@
 set -e
 
 docker-compose \
-  -f docker-compose.base.yml \
   -f docker-compose.yml \
-  -f docker-compose.dev.yml \
+  -f example/docker-compose.base.yml \
+  -f example/authelia/docker-compose.dev.yml \
   -f example/mongo/docker-compose.yml \
   -f example/redis/docker-compose.yml \
   -f example/nginx/docker-compose.yml \
diff --git a/scripts/example-commit/dc-example.sh b/scripts/example-commit/dc-example.sh
index 59c344c4..7d38612e 100755
--- a/scripts/example-commit/dc-example.sh
+++ b/scripts/example-commit/dc-example.sh
@@ -3,8 +3,8 @@
 set -e
 
 docker-compose \
-  -f docker-compose.base.yml \
   -f docker-compose.yml \
+  -f example/docker-compose.base.yml \
   -f example/mongo/docker-compose.yml \
   -f example/redis/docker-compose.yml \
   -f example/nginx/docker-compose.yml \
diff --git a/scripts/example-dockerhub/dc-example.sh b/scripts/example-dockerhub/dc-example.sh
index 94d242ba..df09c07e 100755
--- a/scripts/example-dockerhub/dc-example.sh
+++ b/scripts/example-dockerhub/dc-example.sh
@@ -3,8 +3,8 @@
 set -e
 
 docker-compose \
-  -f docker-compose.base.yml \
-  -f example/authelia/docker-compose.yml \
+  -f example/docker-compose.base.yml \
+  -f example/authelia/docker-compose.dockerhub.yml \
   -f example/mongo/docker-compose.yml \
   -f example/redis/docker-compose.yml \
   -f example/nginx/docker-compose.yml \