diff --git a/authentication.docker-compose.yml b/authentication/authentication.docker-compose.yml
similarity index 77%
rename from authentication.docker-compose.yml
rename to authentication/authentication.docker-compose.yml
index 1dab260..4da9742 100644
--- a/authentication.docker-compose.yml
+++ b/authentication/authentication.docker-compose.yml
@@ -44,20 +44,20 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/volumes/authelia/config/
+      device: ${NASCOMPOSE_SERVICES?}/authentication/volumes/authelia_config/
 
 configs:
   authelia_configuration:
-    file: ${NASCOMPOSE_SERVICES?}/configs/authelia/configuration.yml
+    file: ${NASCOMPOSE_SERVICES?}/authentication/configs/configuration.yml
   authelia_access:
-    file: ${NASCOMPOSE_SERVICES?}/configs/authelia/access.yml
+    file: ${NASCOMPOSE_SERVICES?}/authentication/configs/access.yml
   authelia_authentication:
-    file: ${NASCOMPOSE_SERVICES?}/configs/authelia/authentication.yml
+    file: ${NASCOMPOSE_SERVICES?}/authentication/configs/authentication.yml
 
 secrets:
   jwt_secret:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/authelia/jwt_secret
+    file: ${NASCOMPOSE_SERVICES?}/authentication/secrets/jwt_secret
   storage_key:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/authelia/storage_key
+    file: ${NASCOMPOSE_SERVICES?}/authentication/secrets/storage_key
   smtp_password:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/authelia/smtp_password
+    file: ${NASCOMPOSE_SERVICES?}/authentication/secrets/smtp_password
diff --git a/docker/configs/authelia/access.yml b/authentication/configs/access.yml
similarity index 100%
rename from docker/configs/authelia/access.yml
rename to authentication/configs/access.yml
diff --git a/docker/configs/authelia/authentication.yml b/authentication/configs/authentication.yml
similarity index 100%
rename from docker/configs/authelia/authentication.yml
rename to authentication/configs/authentication.yml
diff --git a/docker/configs/authelia/configuration.yml b/authentication/configs/configuration.yml
similarity index 100%
rename from docker/configs/authelia/configuration.yml
rename to authentication/configs/configuration.yml
diff --git a/docker/secrets/authelia/README.md b/authentication/secrets/.gitkeep
similarity index 100%
rename from docker/secrets/authelia/README.md
rename to authentication/secrets/.gitkeep