diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index f1b8a72..5ea2c4a 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -358,3 +358,14 @@ keycloak_clients:
         keycloak_id: "00000000-0000-0000-0000-000000000022"
         groups: ""
         master_address: "https://youtube-proxy.atlantishq.de"
+
+    atlantis-status:
+        party_secret: "EHISTORY_PURGED_SECRET"
+        client_id: tube-archivist
+        client_secret: "HISTORY_PURGED_SECRET"
+        redirect_uris:
+            - "https://actions.atlantishq.de/*"
+        description: "Tube Archivist"
+        keycloak_id: "00000000-0000-0000-0000-000000000023"
+        groups: ""
+        master_address: "https://actions.atlantishq.de"
diff --git a/roles/docker-deployments/tasks/main.yaml b/roles/docker-deployments/tasks/main.yaml
index 29fd965..e3b32da 100644
--- a/roles/docker-deployments/tasks/main.yaml
+++ b/roles/docker-deployments/tasks/main.yaml
@@ -68,6 +68,7 @@
     - immich
     - gitea
     - gitea-runner
+    - atlantis-status
 
 - name: Copy AtlantisHub config
   copy:
@@ -117,13 +118,13 @@
     - money-balancer
     - atlantis-web-check
     - ntfy
-    - ferchau-wscad
     - code-server
     - serienampel
     - nginx-media-cdn
     - immich
     - gitea
     - gitea-runner
+    - atlantis-status
 
 - name: Copy compose templates
   template:
@@ -147,13 +148,13 @@
     - money-balancer
     - atlantis-web-check
     - ntfy
-    - ferchau-wscad
     - code-server
     - serienampel
     - nginx-media-cdn
     - immich
     - gitea
     - gitea-runner
+    - atlantis-status
 
 - name: create sites-enabled dir
   file:
@@ -186,6 +187,7 @@
 
 - name: Deploy compose templates
   community.docker.docker_compose_v2:
+    remove_orphans: true
     project_src: "/opt/{{ item }}/"
     pull: "missing"
     files:
@@ -209,13 +211,13 @@
     #- money-balancer
     - atlantis-web-check
     - ntfy
-    #- ferchau-wscad
     - code-server
     - serienampel
     - nginx-media-cdn
     - immich
     - gitea
     - gitea-runner
+    - atlantis-status
 
 - name: OAuth2Proxy directories
   file:
@@ -233,8 +235,8 @@
     #- reactive-resume
     - money-balancer
     - atlantis-web-check
-    - ferchau-wscad
     - olive-tin
+    - atlantis-status
 
 - name: include services ports
   include_vars: services.yaml
@@ -243,6 +245,7 @@
   template:
     src: oauth-standalone-docker-compose.yaml
     dest: "/opt/oauth2proxy/{{ item }}/docker-compose.yaml"
+    remove_orphans: true
   with_items:
     - tmnf-replay-server
     - atlantis-hub
@@ -254,8 +257,8 @@
     - reactive-resume
     - money-balancer
     - atlantis-web-check
-    - ferchau-wscad
     - olive-tin
+    - atlantis-status
 
 - name: Deploy OAuth2Proxy
   community.docker.docker_compose_v2:
@@ -272,5 +275,5 @@
     #- reactive-resume
     #- money-balancer
     - atlantis-web-check
-    - ferchau-wscad
     - olive-tin
+    - atlantis-status
diff --git a/roles/docker-deployments/templates/atlantis-status.yaml b/roles/docker-deployments/templates/atlantis-status.yaml
new file mode 100644
index 0000000..f613db0
--- /dev/null
+++ b/roles/docker-deployments/templates/atlantis-status.yaml
@@ -0,0 +1,8 @@
+services:
+  atlantis-status-management:
+    ports:
+        - 6025:5000
+    volumes:
+        - /data/services:/services
+    image: harbor-registry.atlantishq.de/atlantishq/atlantis-status:latest
+    restart: always