diff --git a/docker-compose.yml b/docker-compose.yml
index f394608..d5d642b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -85,6 +85,8 @@ services:
       - MYJD_DEVICE_NAME=dockerserver
       - XDG_DOWNLOAD_DIR=/output
     network_mode: "service:gluetun"
+    depends_on:
+      - gluetun
     restart: always
     volumes:
       - ${DOCKERCONFIGS}/jdownloader:/config
@@ -173,17 +175,6 @@ services:
       - ${MEDIA_DIR}/downloads/nzbs:/nzbs
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
-  olivetin:
-    container_name: olivetin
-    image: jamesread/olivetin
-    user: root
-    ports:
-      - 1337:1337
-    restart: always
-    volumes:
-      - ${DOCKERCONFIGS}/olivetin/config:/config
-      - /var/run/docker.sock:/var/run/docker.sock
-
   organizr:
     container_name: organizr
     image: organizr/organizr:latest
@@ -310,6 +301,8 @@ services:
       - TZ=${TZ}
       - WEBUI_PORT=8282
     network_mode: "service:gluetun"
+    depends_on:
+      - gluetun
     restart: always
     volumes:
       - ${DOCKERCONFIGS}/qbittorrent/config:/config
@@ -345,6 +338,8 @@ services:
       - PGID=${PGID}
       - TZ=${TZ}
     network_mode: "service:gluetun"
+    depends_on:
+      - gluetun
     restart: always
     volumes:
       - ${DOCKERCONFIGS}/sabnzbd:/config
diff --git a/olivetin/config.yaml b/olivetin/config.yaml
deleted file mode 100644
index bda9ee3..0000000
--- a/olivetin/config.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-actions:
-  - title: "Restart Gluetun and Services"
-    shell: /config/restart-gluetun-and-services.sh
-    timeout: 75
-
-  - title: "Restart qBittorrent"
-    shell: docker restart qbittorrent && echo qbittorrent restarted
-    timeout: 15
-
-  - title: "Restart SABnzbd"
-    shell: docker restart sabnzbd && echo sabnzbd restarted
-    timeout: 15
-
-  - title: "Restart JDownloader"
-    shell: docker restart jdownloader && echo jdownloader restarted
-    timeout: 15
-
-  - title: "Shutdown Proxmox1"
-    shell: /config/shutdown-proxmox1.sh
-    timeout: 15