diff --git a/docker-compose.yml b/docker-compose.yml
index 08bbc5c..9b4240b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,85 +1,6 @@
 version: "2.1"
+
 services:
-  homepage:
-    image: ghcr.io/benphelps/homepage:latest
-    container_name: homepage
-    ports:
-      - 7800:3000
-    volumes:
-      - /mnt/setupfordad/homepage/config:/app/config # Make sure your local config directory exists
-      - /var/run/docker.sock:/var/run/docker.sock:ro # (optional) For docker integrations
-    restart: unless-stopped
-  sonarr:
-    image: lscr.io/linuxserver/sonarr:latest
-    container_name: sonarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - /mnt/setupfordad/sonarr/config:/config
-      # - c:\media\tv:/tv #optional
-      # - c:\downloads\completed:/downloads #optional
-    ports:
-      - 7801:8989
-    restart: unless-stopped
-  radarr:
-    image: lscr.io/linuxserver/radarr:latest
-    container_name: radarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - /mnt/setupfordad/radarr/config:/config
-      # - c:\media\movies:/movies #optional
-      # - c:\downloads\completed:/downloads #optional
-    ports:
-      - 7802:7878
-    restart: unless-stopped
-  rdtclient:
-    container_name: rdtclient
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC    
-    volumes:
-      # - 'c:\downloads\completed\:/data/downloads'
-      - '/mnt/setupfordad/rdtclient/config:/data/db'
-    image: rogerfar/rdtclient
-    restart: unless-stopped
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-    ports:
-      - '7803:6500'
-  prowlarr:
-    image: lscr.io/linuxserver/prowlarr:latest
-    container_name: prowlarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - /mnt/setupfordad/prowlarr/config:/config
-    ports:
-      - 7804:9696
-    restart: unless-stopped
-  bazarr:
-    image: lscr.io/linuxserver/bazarr:latest
-    container_name: bazarr
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-    volumes:
-      - /mnt/setupfordad/bazarr/config:/config
-      # - c:\media\tv:/movies #optional
-      # - c:\media\movies:/tv #optional
-    ports:
-      - 7805:6767
-    restart: unless-stopped
   gluetun:
     image: qmcgaw/gluetun
     container_name: gluetun
@@ -88,10 +9,10 @@ services:
     devices:
       - /dev/net/tun:/dev/net/tun
     ports:
-      - 18000:8000/tcp # HTTP proxy
-      - 18888:8888/tcp # HTTP proxy
-      - 18388:8388/tcp # Shadowsocks
-      - 18388:8388/udp # Shadowsocks
+      - 18000:8000/tcp
+      - 18888:8888/tcp
+      - 18388:8388/tcp
+      - 18388:8388/udp
     volumes:
       - /mnt/setupfordad/gluetun/config:/gluetun
     environment:
@@ -101,42 +22,161 @@ services:
       - SERVER_COUNTRIES=Netherlands
       - HTTPPROXY=on
       - HTTP_CONTROL_SERVER_LOG=on
+    deploy:
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 256M
     restart: unless-stopped
+
   pihole:
     container_name: pihole
     image: pihole/pihole:latest
-    # For DHCP it is recommended to remove these ports and instead add: network_mode: "host"
+    depends_on:
+      - gluetun
+    command: sh -c "sleep 10 && /s6-init"
     ports:
       - "53:53/tcp"
       - "53:53/udp"
-      #      - "67:67/udp" # Only required if you are using Pi-hole as your DHCP server
       - "7806:80/tcp"
     environment:
       TZ: 'Europe/London'
     volumes:
       - '/mnt/setupfordad/pihole/config/phole:/etc/pihole'
       - '/mnt/setupfordad/pihole/config/dnsmsq:/etc/dnsmasq.d'
-    #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-    #    cap_add:
-    #      - NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed
+    deploy:
+      resources:
+        limits:
+          cpus: "0.30"
+          memory: 256M
+    restart: unless-stopped
+
+  prowlarr:
+    image: lscr.io/linuxserver/prowlarr:latest
+    container_name: prowlarr
+    depends_on:
+      - gluetun
+    command: sh -c "sleep 20 && /init"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /mnt/setupfordad/prowlarr/config:/config
+    ports:
+      - 7804:9696
+    deploy:
+      resources:
+        limits:
+          cpus: "0.30"
+          memory: 256M
+    restart: unless-stopped
+
+  sonarr:
+    image: lscr.io/linuxserver/sonarr:latest
+    container_name: sonarr
+    depends_on:
+      - prowlarr
+    command: sh -c "sleep 30 && /init"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /mnt/setupfordad/sonarr/config:/config
+    ports:
+      - 7801:8989
+    deploy:
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 512M
+    restart: unless-stopped
+
+  radarr:
+    image: lscr.io/linuxserver/radarr:latest
+    container_name: radarr
+    depends_on:
+      - prowlarr
+    command: sh -c "sleep 30 && /init"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /mnt/setupfordad/radarr/config:/config
+    ports:
+      - 7802:7878
+    deploy:
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 512M
+    restart: unless-stopped
+
+  bazarr:
+    image: lscr.io/linuxserver/bazarr:latest
+    container_name: bazarr
+    depends_on:
+      - sonarr
+      - radarr
+    command: sh -c "sleep 45 && /init"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /mnt/setupfordad/bazarr/config:/config
+    ports:
+      - 7805:6767
+    deploy:
+      resources:
+        limits:
+          cpus: "0.30"
+          memory: 256M
+    restart: unless-stopped
+
+  rdtclient:
+    container_name: rdtclient
+    image: rogerfar/rdtclient
+    depends_on:
+      - gluetun
+    command: sh -c "sleep 40 && /entrypoint.sh"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /mnt/setupfordad/rdtclient/config:/data/db
+    ports:
+      - '7803:6500'
+    deploy:
+      resources:
+        limits:
+          cpus: "0.30"
+          memory: 256M
+    logging:
+      driver: json-file
+      options:
+        max-size: 10m
+    restart: unless-stopped
+
+  homepage:
+    image: ghcr.io/benphelps/homepage:latest
+    container_name: homepage
+    depends_on:
+      - sonarr
+      - radarr
+      - prowlarr
+      - pihole
+    command: sh -c "sleep 60 && npm start"
+    ports:
+      - 7800:3000
+    volumes:
+      - /mnt/setupfordad/homepage/config:/app/config
+    deploy:
+      resources:
+        limits:
+          cpus: "0.20"
+          memory: 128M
     restart: unless-stopped
-  # nextpvr:
-  #   container_name: nextpvr
-  #   volumes:
-  #     - '/mnt/setupfordad/nextpvr/config:/config'
-  #     # - 'c:\media\recordings:/recordings'
-  #     - '/mnt/setupfordad/nextpvr/buffer\:/buffer'
-  #   restart: unless-stopped
-  #   ports:
-  #     - '7807:8866'
-  #     - '16891:16891/udp'
-  #   image: 'nextpvr/nextpvr_amd64:stable'
-  # portainer:
-  #   container_name: portainer
-  #   image: portainer/portainer-ce:lts
-  #   restart: always
-  #   volumes:
-  #     - /var/run/docker.sock:/var/run/docker.sock
-  #     - /mnt/setupfordad/portainer_data:/data
-  #   ports:
-  #     - 9443:9443