diff --git a/roles/caddy/templates/compose.yaml.jinja b/roles/caddy/templates/compose.yaml.jinja
index 9743176..10ca38b 100644
--- a/roles/caddy/templates/compose.yaml.jinja
+++ b/roles/caddy/templates/compose.yaml.jinja
@@ -1,5 +1,5 @@
 services:
-  app:
+  caddy:
     image: lucaslorentz/caddy-docker-proxy:ci-alpine
     ports:
       - 80:80
diff --git a/roles/grocy/templates/compose.yaml.jinja b/roles/grocy/templates/compose.yaml.jinja
index 6a6e58c..8b75bd6 100644
--- a/roles/grocy/templates/compose.yaml.jinja
+++ b/roles/grocy/templates/compose.yaml.jinja
@@ -1,5 +1,5 @@
 services:
-  app:
+  grocy:
     container_name: grocy
     image: lscr.io/linuxserver/grocy:latest
     networks:
diff --git a/roles/paperless/templates/compose.yaml.jinja b/roles/paperless/templates/compose.yaml.jinja
index 2777370..06dc145 100644
--- a/roles/paperless/templates/compose.yaml.jinja
+++ b/roles/paperless/templates/compose.yaml.jinja
@@ -1,5 +1,6 @@
 services:
-  app:
+  paperless:
+    container_name: paperless
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
     networks:
@@ -8,8 +9,8 @@ services:
     security_opt:
       - no-new-privileges:true
     depends_on:
-      - redis
-      - postgres
+      - paperless-redis
+      - paperless-postgres
     volumes:
       - "{{ stack_paperless_env_dir }}/data/paperless:/usr/src/paperless/data" # container data
       - "{{ stack_paperless_env_dir }}/data/paperless_export:/usr/src/paperless/export" # backup location
@@ -23,8 +24,8 @@ services:
       - "PAPERLESS_OCR_LANGUAGES={{ stack_paperless_ocr_languages }}"
       - "PAPERLESS_OCR_SKIP_ARCHIVE_FILE={{ stack_paperless_ocr_skip_archive_file }}"
       - "PAPERLESS_ENABLE_UPDATE_CHECK={{ stack_paperless_enable_update_check }}"
-      - "PAPERLESS_REDIS=redis://redis:6379"
-      - "PAPERLESS_DBHOST=postgres"
+      - "PAPERLESS_REDIS=redis://paperless-redis:6379"
+      - "PAPERLESS_DBHOST=paperless-postgres"
       - "PAPERLESS_DBNAME={{ stack_paperless_dbname }}"
       - "PAPERLESS_DBUSER={{ stack_paperless_dbuser }}"
       - "PAPERLESS_DBPASS={{ stack_paperless_dbpass }}"
@@ -36,7 +37,8 @@ services:
       caddy: "{{ stack_paperless_subdomain }}"
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8000{{ '}}'}}"
 
-  postgres:
+  paperless-postgres:
+    container_name: paperless-postgres
     image: postgres:16.0-alpine #fixedVersion
     restart: unless-stopped
     networks:
@@ -50,7 +52,8 @@ services:
       POSTGRES_USER: "{{ stack_paperless_dbuser }}"
       POSTGRES_PASSWORD: "{{ stack_paperless_dbpass }}"
 
-  redis:
+  paperless-redis:
+    container_name: paperless-redis
     image: redis:7.2-alpine #fixedVersion
     restart: unless-stopped
     networks:
diff --git a/site.yaml b/site.yaml
index bf4e33f..eb20d2e 100644
--- a/site.yaml
+++ b/site.yaml
@@ -59,10 +59,6 @@
         name: caddy
       tags: caddy
 
-    - name: Set up Restic stack
-      ansible.builtin.import_role:
-        name: restic
-
     - name: Set up Arr stack
       ansible.builtin.import_role:
         name: arr
@@ -77,3 +73,8 @@
       ansible.builtin.import_role:
         name: grocy
       tags: grocy
+
+    - name: Set up Restic stack
+      ansible.builtin.import_role:
+        name: restic
+      tags: restic