diff --git a/custom/docker-compose.custom.multiple-printers.yaml b/custom/docker-compose.custom.multiple-printers.yaml
index fccf1e9..2efe59f 100644
--- a/custom/docker-compose.custom.multiple-printers.yaml
+++ b/custom/docker-compose.custom.multiple-printers.yaml
@@ -65,17 +65,26 @@ services:
     command: -I printer_data/run/printer1.klipper.tty -a printer_data/run/printer1.klipper.sock printer_data/config/printer1.cfg -l printer_data/logs/printer1.klippy.log
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0
+    labels:
+      org.prind.service: klipper
+      org.prind.printer: printer1
   printer1-moonraker:
     <<: *moonraker-svc
     command: -d printer_data -c printer_data/config/printer1.moonraker.conf -l printer_data/logs/printer1.moonraker.log
     ports:
       - 8101:7125
+    labels:
+      org.prind.service: moonraker
+      org.prind.printer: printer1
   printer1-webcam:
     <<: *ustreamer-svc
     devices:
       - /dev/video0:/dev/webcam
     ports:
       - 8102:8080
+    labels:
+      org.prind.service: webcam
+      org.prind.printer: printer1
 
   ## Printer2
   ## Access api via port 8201/tcp and webcam via 8202/tcp
@@ -84,17 +93,26 @@ services:
     command: -I printer_data/run/printer2.klipper.tty -a printer_data/run/printer2.klipper.sock printer_data/config/printer2.cfg -l printer_data/logs/printer2.klippy.log
     devices:
       - /dev/ttyUSB1:/dev/ttyUSB1
+    labels:
+      org.prind.service: klipper
+      org.prind.printer: printer2
   printer2-moonraker:
     <<: *moonraker-svc
     command: -d printer_data -c printer_data/config/printer2.moonraker.conf -l printer_data/logs/printer2.moonraker.log
     ports:
       - 8201:7125
+    labels:
+      org.prind.service: moonraker
+      org.prind.printer: printer2
   printer2-webcam:
     <<: *ustreamer-svc
     devices:
       - /dev/video1:/dev/webcam
     ports:
       - 8202:8080
+    labels:
+      org.prind.service: webcam
+      org.prind.printer: printer2
 
   ## Use Fluidd as Frontend
   fluidd:
@@ -102,6 +120,8 @@ services:
     restart: unless-stopped
     ports:
       - 80:80
+    labels:
+      org.prind.service: fluidd
 
 volumes:
   run:
diff --git a/custom/docker-compose.custom.portainer.yaml b/custom/docker-compose.custom.portainer.yaml
index 0a062ca..295350e 100644
--- a/custom/docker-compose.custom.portainer.yaml
+++ b/custom/docker-compose.custom.portainer.yaml
@@ -36,6 +36,8 @@ services:
       - run:/opt/printer_data/run
       - gcode:/opt/printer_data/gcodes
       - log:/opt/printer_data/logs
+    labels:
+      org.prind.service: klipper
 
   moonraker:
     image: mkuf/moonraker:latest
@@ -59,10 +61,11 @@ services:
       - moonraker-db:/opt/printer_data/database
       - /data/prind/config:/opt/printer_data/config
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.moonraker.loadbalancer.server.port=7125"
-      - "traefik.http.routers.moonraker.rule=PathPrefix(`/websocket`,`/printer`,`/api`,`/access`,`/machine`,`/server`)"
-      - "traefik.http.routers.moonraker.entrypoints=web"
+      org.prind.service: moonraker
+      traefik.enable: true
+      traefik.http.services.moonraker.loadbalancer.server.port: 7125
+      traefik.http.routers.moonraker.rule: PathPrefix(`/websocket`,`/printer`,`/api`,`/access`,`/machine`,`/server`)
+      traefik.http.routers.moonraker.entrypoints: web
 
   webcam:
     image: mkuf/ustreamer:latest
@@ -71,27 +74,31 @@ services:
     devices:
       - /dev/video0:/dev/webcam
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.webcam.loadbalancer.server.port=8080"
-      - "traefik.http.routers.webcam.rule=PathPrefix(`/webcam`)"
-      - "traefik.http.routers.webcam.entrypoints=web"
-      - "traefik.http.middlewares.webcam.stripprefix.prefixes=/webcam"
-      - "traefik.http.routers.webcam.middlewares=webcam"
+      org.prind.service: webcam
+      traefik.enable: true
+      traefik.http.services.webcam.loadbalancer.server.port: 8080
+      traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
+      traefik.http.routers.webcam.entrypoints: web
+      traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
+      traefik.http.routers.webcam.middlewares: webcam
 
   fluidd:
     image: cadriel/fluidd:latest
     restart: unless-stopped
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.fluidd.loadbalancer.server.port=80"
-      - "traefik.http.routers.fluidd.rule=PathPrefix(`/`)"
-      - "traefik.http.routers.fluidd.entrypoints=web"
+      org.prind.service: fluidd
+      traefik.enable: true
+      traefik.http.services.fluidd.loadbalancer.server.port: 80
+      traefik.http.routers.fluidd.rule: PathPrefix(`/`)
+      traefik.http.routers.fluidd.entrypoints: web
 
   init:
     image: busybox:latest
     command: chown -R 1000:1000 /prind/config
     volumes:
       - /data/prind:/prind
+    labels:
+      org.prind.service: init
 
   traefik:
     image: traefik:v2.5
@@ -105,6 +112,8 @@ services:
     restart: unless-stopped
     volumes:
         - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    labels:
+      org.prind.service: traefik
 
 volumes:
   run: