diff --git a/Dockerfile-plugins b/Dockerfile-plugins
index 97297c2..7f1d7d2 100644
--- a/Dockerfile-plugins
+++ b/Dockerfile-plugins
@@ -1,6 +1,6 @@
 # Dockerfile-plugins
 ARG FROM_TAG=v4.4-3.4.0
-FROM ghcr.io/netbox-community/netbox:${FROM_TAG}-plugins
+FROM ghcr.io/netbox-community/netbox:${FROM_TAG}
 
 # Für Plugin-Install: kurz root werden
 USER root
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 00ec06f..afcda5f 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,30 +1,15 @@
-version: "3.9"
-
-x-netbox-image: &netbox_image netboxplugins:local
-
 services:
   netbox:
     build:
       context: .
       dockerfile: Dockerfile-plugins
-      args:
-        FROM_TAG: v4.4-3.4.0
-    image: *netbox_image
-    pull_policy: never
+    image: netbox-plugins:v4.4-3.4.0
+    restart: unless-stopped
     ports:
       - "8000:8080"
+
+  netbox-worker:
     restart: unless-stopped
 
-  worker:
-    image: *netbox_image
-    pull_policy: never
-    restart: unless-stopped
-
-  housekeeping:
-    image: *netbox_image
-    pull_policy: never
-    command: /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping
-    depends_on:
-      - postgres
-      - redis
+  netbox-housekeeping:
     restart: unless-stopped