diff --git a/docker-compose.yml b/docker-compose.yml
index 2686993..1900bcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,37 +8,7 @@ networks:
 
 #### SERVICES
 services:
-### hello_world
-  hello_world:
-    container_name: gitea-app
-    hostname: gitea-app
-    image: hello-world
-    environment:
-    restart: always
-
-    volumes:
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=traefik_front_network"
-# HTTP
-      - "traefik.http.routers.hello-world-http.rule=Host(`hello-world.tips-of-mine.com`)"
-      - "traefik.http.routers.hello-world-http.entrypoints=http"
-      - "traefik.http.routers.hello-world-http.priority=49"
-# HTTPS
-      - "traefik.http.routers.hello-world-https.rule=Host(`hello-world.tips-of-mine.com`)"
-      - "traefik.http.routers.hello-world-https.entrypoints=https"
-      - "traefik.http.routers.hello-world-https.tls=true"
-      - "traefik.http.routers.hello-world-https.priority=50"
-      - "traefik.http.routers.gitea.service=gitea-https-service"
-# Middleware
-# Service
-#      - "traefik.http.services.gitea-https-service.loadbalancer.server.port=3000"
-#      - "traefik.http.services.gitea-https-service.loadbalancer.server.scheme=https"
-#      - "traefik.http.services.gitea-https-service.loadbalancer.healthcheck.hostname=gitea.traefik.me"
-#      - "traefik.http.services.gitea-https-service.loadbalancer.healthcheck.method=foobar"
-#      - "traefik.http.services.gitea-https-service.loadbalancer.healthcheck.timeout=10"
-
-  db:
+  librenms-db:
     container_name: librenms-db
     hostname: librenms-db
     image: mariadb:10
@@ -61,7 +31,7 @@ services:
       - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
     restart: always
 
-  redis:
+  librenms-redis:
     container_name: librenms-redis
     hostname: librenms-redis
     image: redis:7.2-alpine
@@ -71,7 +41,7 @@ services:
       - "TZ=${TZ}"
     restart: always
 
-  msmtpd:
+  librenms-msmtpd:
     container_name: librenms-msmtpd
     hostname: librenms-msmtpd
     image: crazymax/msmtpd:latest
@@ -82,14 +52,14 @@ services:
 #      - "./msmtpd.env"
     restart: always
 
-  librenms:
+  librenms-app:
     container_name: librenms-app
     hostname: librenms-app
     image: librenms/librenms:latest
     depends_on:
-      - db
-      - redis
-      - msmtpd
+      - librenms-db
+      - librenms-redis
+      - librenms-msmtpd
     volumes:
       - "./librenms:/data"
     labels:
@@ -122,13 +92,13 @@ services:
       - "DB_TIMEOUT=60"
     restart: always
 
-  dispatcher:
+  librenms-dispatcher:
     container_name: librenms-dispatcher
     hostname: librenms-dispatcher
     image: librenms/librenms:latest
     depends_on:
-      - librenms
-      - redis
+      - librenms-app
+      - librenms-redis
     volumes:
       - "./librenms:/data"
     networks:
@@ -147,13 +117,13 @@ services:
       - "SIDECAR_DISPATCHER=1"
     restart: always
 
-  syslogng:
+  librenms-syslogng:
     container_name: librenms-syslog
     hostname: librenms-syslog
     image: librenms/librenms:latest
     depends_on:
-      - librenms
-      - redis
+      - librenms-app
+      - librenms-redis
     ports:
       - target: 514
         published: 514
@@ -175,13 +145,13 @@ services:
       - "SIDECAR_SYSLOGNG=1"
     restart: always
 
-  snmptrapd:
+  librenms-snmptrapd:
     container_name: librenms-snmptrapd
     hostname: librenms-snmptrapd
     image: librenms/librenms:latest
     depends_on:
-      - librenms
-      - redis
+      - librenms-app
+      - librenms-redis
     ports:
       - target: 162
         published: 162