diff --git a/roles/authentik/tasks/main.yml b/roles/authentik/tasks/main.yml
index f2a106b..c5f9aba 100644
--- a/roles/authentik/tasks/main.yml
+++ b/roles/authentik/tasks/main.yml
@@ -5,8 +5,8 @@
     authentik_service_name: "authentik{{ '_' + docker_service_suffix if docker_service_suffix is defined else '' }}"
 
 - name: Authentik container
-  ansible.builtin.import_role:
-    name: container
+  ansible.builtin.include_role:
+    name: service
   vars:
     docker_service: authentik
     docker_image: beryju/authentik:latest
@@ -19,17 +19,18 @@
     docker_env: "{{ authentik_common_env | combine(authentik_env) }}"
     docker_mounts:
       - path: /media
-        absolute_name: "{{ authentik_service_name }}_media"
+        name: "media"
       - path: /templates
-        absolute_name: "{{ authentik_service_name }}_templates"
+        name: "templates"
       - path: /certs
-        name: "{{ authentik_service_name }}_certs"
+        name: "certs"
 
 - name: Authentik worker container
-  ansible.builtin.import_role:
-    name: container
+  ansible.builtin.include_role:
+    name: service
   vars:
-    docker_service: authentik_worker
+    docker_namespace: authentik
+    docker_service: worker
     docker_image: beryju/authentik:latest
     docker_command:
       - worker
@@ -37,8 +38,8 @@
     docker_env: "{{ authentik_common_env | combine(authentik_env) }}"
     docker_mounts:
       - path: /media
-        absolute_name: "{{ authentik_service_name }}_media"
+        name: "media"
       - path: /templates
-        absolute_name: "{{ authentik_service_name }}_templates"
+        name: "templates"
       - path: /certs
-        name: "{{ authentik_service_name }}_certs"
+        name: "certs"
diff --git a/roles/authentik/vars/main.yml b/roles/authentik/vars/main.yml
index 0e66baf..9d16e5d 100644
--- a/roles/authentik/vars/main.yml
+++ b/roles/authentik/vars/main.yml
@@ -1,8 +1,8 @@
 ---
 
 authentik_common_env:
-  AUTHENTIK_REDIS__HOST: authentik_redis
-  AUTHENTIK_POSTGRESQL__HOST: authentik_db
+  AUTHENTIK_REDIS__HOST: authentik-redis
+  AUTHENTIK_POSTGRESQL__HOST: authentik-db
   AUTHENTIK_POSTGRESQL__USER: authentik
   AUTHENTIK_POSTGRESQL__NAME: authentik
   AUTHENTIK_POSTGRESQL__PASSWORD: "{{ database_passwords.authentik }}"