diff --git a/roles/docker/files/caddy-compose.yml b/roles/docker/files/caddy-compose.yml
index b494a56..07abda4 100644
--- a/roles/docker/files/caddy-compose.yml
+++ b/roles/docker/files/caddy-compose.yml
@@ -11,11 +11,9 @@ services:
       - ./site:/srv
       - caddy_data:/data
       - caddy_config:/config
-
 volumes:
   caddy_data:
   caddy_config:
-
 networks:
   default:
     external: true
diff --git a/roles/docker/files/gitea-compose.yml b/roles/docker/files/gitea-compose.yml
index e427ec5..95b5bfe 100644
--- a/roles/docker/files/gitea-compose.yml
+++ b/roles/docker/files/gitea-compose.yml
@@ -14,12 +14,10 @@ services:
     ports:
       - 222:22
     extra_hosts:
-      - 'auth.thesatelliteoflove.com:172.20.0.2'
-
+      - 'auth.thesatelliteoflove.com:172.20.0.3'
 volumes:
   gitea:
     driver: local
-
 networks:
   default:
     external: true
diff --git a/roles/docker/files/hoarder-compose.yml b/roles/docker/files/hoarder-compose.yml
index b266da8..f6388c6 100644
--- a/roles/docker/files/hoarder-compose.yml
+++ b/roles/docker/files/hoarder-compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: ghcr.io/hoarder-app/hoarder-web:${HOARDER_VERSION:-release}
+    image: ghcr.io/hoarder-app/hoarder:${HOARDER_VERSION:-release}
     restart: unless-stopped
     volumes:
       - data:/data
@@ -10,14 +10,9 @@ services:
     env_file:
       - .env
     environment:
-      REDIS_HOST: redis
       MEILI_ADDR: http://meilisearch:7700
       DATA_DIR: /data
-  redis:
-    image: redis:7.2-alpine
-    restart: unless-stopped
-    volumes:
-      - redis:/data
+      BROWSER_WEB_URL: http://chrome:9222
   chrome:
     image: gcr.io/zenika-hub/alpine-chrome:123
     restart: unless-stopped
@@ -37,27 +32,9 @@ services:
       MEILI_NO_ANALYTICS: "true"
     volumes:
       - meilisearch:/meili_data
-  workers:
-    image: ghcr.io/hoarder-app/hoarder-workers:${HOARDER_VERSION:-release}
-    restart: unless-stopped
-    volumes:
-      - data:/data
-    env_file:
-      - .env
-    environment:
-      REDIS_HOST: redis
-      MEILI_ADDR: http://meilisearch:7700
-      BROWSER_WEB_URL: http://chrome:9222
-      DATA_DIR: /data
-    depends_on:
-      web:
-        condition: service_started
-
 volumes:
-  redis:
   meilisearch:
   data:
-
 networks:
   default:
     external: true
diff --git a/roles/docker/files/tasksmd-compose.yml b/roles/docker/files/tasksmd-compose.yml
index 54fdf8c..799c47c 100644
--- a/roles/docker/files/tasksmd-compose.yml
+++ b/roles/docker/files/tasksmd-compose.yml
@@ -10,14 +10,11 @@ services:
       - tasksmd-data:/tasks
       - tasksmd-config:/config
     restart: unless-stopped
-
 volumes:
   tasksmd-data:
     driver: local
-
   tasksmd-config:
     driver: local
-
 networks:
   default:
     external: true
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 1e4a9b8..2ecb682 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -64,21 +64,28 @@
 
 - name: Install caddy
   import_tasks: caddy.yml
+  tags: caddy
 
 - name: Install gitea
   import_tasks: gitea.yml
+  tags: gitea
 
 - name: Install hoarder
   import_tasks: hoarder.yml
+  tags: hoarder
 
 - name: Install authentik
   import_tasks: authentik.yml
+  tags: authentik
 
 - name: Install gotosocial
   import_tasks: gotosocial.yml
+  tags: gotosocial
 
 - name: Install grist
   import_tasks: grist.yml
+  tags: grist
 
 - name: Install tasksmd
-  import_tasks: tasksmd.yml
\ No newline at end of file
+  import_tasks: tasksmd.yml
+  tags: tasksmd
\ No newline at end of file
diff --git a/roles/docker/tasks/shell.yml b/roles/docker/tasks/shell.yml
index 4323d07..b0b3db3 100644
--- a/roles/docker/tasks/shell.yml
+++ b/roles/docker/tasks/shell.yml
@@ -42,5 +42,5 @@
 - name: Create symlink for batcat
   ansible.builtin.file:
     src: /usr/bin/batcat
-    dest: "{{ ansible_env.HOME }}/.local/bin/bat"
+    dest: "/home/{{ ansible_user }}/.local/bin/bat"
     state: link
\ No newline at end of file
diff --git a/roles/docker/templates/gotosocial-compose.yml.j2 b/roles/docker/templates/gotosocial-compose.yml.j2
index 6ee9a7d..1af3f20 100644
--- a/roles/docker/templates/gotosocial-compose.yml.j2
+++ b/roles/docker/templates/gotosocial-compose.yml.j2
@@ -6,14 +6,14 @@ services:
     container_name: gotosocial
     user: 1000:1000
     extra_hosts:
-      - 'auth.thesatelliteoflove.com:172.20.0.2'
+      - 'auth.thesatelliteoflove.com:172.20.0.3'
     environment:
       GTS_HOST: social.thesatelliteoflove.com
       GTS_DB_TYPE: sqlite
       GTS_DB_ADDRESS: /gotosocial/storage/sqlite.db
       GTS_LETSENCRYPT_ENABLED: "false"
       GTS_LETSENCRYPT_EMAIL_ADDRESS: ""
-      GTS_TRUSTED_PROXIES: "172.20.0.2"
+      GTS_TRUSTED_PROXIES: "172.20.0.3"
       GTS_ACCOUNT_DOMAIN: thesatelliteoflove.com
       GTS_OIDC_ENABLED: "true"
       GTS_OIDC_IDP_NAME: "Authentik"
diff --git a/roles/docker/templates/grist-compose.yml.j2 b/roles/docker/templates/grist-compose.yml.j2
index 4f5226e..da0d952 100644
--- a/roles/docker/templates/grist-compose.yml.j2
+++ b/roles/docker/templates/grist-compose.yml.j2
@@ -4,7 +4,7 @@ services:
     volumes:
       - grist:/persist
     extra_hosts:
-      - 'auth.thesatelliteoflove.com:172.20.0.2'
+      - 'auth.thesatelliteoflove.com:172.20.0.3'
     environment:
       - GRIST_SESSION_SECRET={{ grist_session_secret }}
       - APP_HOME_URL=https://grist.thesatelliteoflove.com