diff --git a/docker-compose.yml b/docker-compose.yml
index 10a2866..1f68c55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -109,8 +109,8 @@ services:
       - /mnt/data/downloads:/downloads
       - /etc/localtime:/etc/localtime:ro
 
-  jdownloader2:
-    container_name: jdownloader2
+  jdownloader:
+    container_name: jdownloader
     image: jlesage/jdownloader-2:latest
     environment:
       - PGID=${PGID}
@@ -122,11 +122,11 @@ services:
       - MYJD_USER=akanealw@gmail.com
       - MYJD_PASSWORD=trUKY4X8wzGiCr75ZmC9
       - MYJD_DEVICE_NAME=dockerserver
-      - XDG_DOWNLOAD_DIR=/output
+      - XDG_DOWNLOAD_DIR=/downloads
     network_mode: "service:gluetun"
     restart: unless-stopped
     volumes:
-      - ./appdata/jdownloader2:/config
+      - ./appdata/jdownloader:/config
       - /mnt/data/downloads/jdownloader:/output
       - /etc/localtime:/etc/localtime:ro
 
@@ -227,8 +227,8 @@ services:
       - ./appdata/mstream:/config
       - /mnt/storage/music:/music
 
-  nzbhydra2:
-    container_name: nzbhydra2
+  nzbhydra:
+    container_name: nzbhydra
     image: binhex/arch-nzbhydra2:latest
     environment:
       - PGID=${PGID}
@@ -238,8 +238,8 @@ services:
       - 5076:5076/tcp
     restart: unless-stopped
     volumes:
-      - ./appdata/nzbhydra2/data:/data
-      - ./appdata/nzbhydra2:/config
+      - ./appdata/nzbhydra/data:/data
+      - ./appdata/nzbhydra:/config
       - /mnt/data/downloads:/downloads
       - /etc/localtime:/etc/localtime:ro