diff --git a/docker_compose/gluetun/docker-compose.yaml b/docker_compose/gluetun/docker-compose.yaml
index 76fa19a..a648d0e 100644
--- a/docker_compose/gluetun/docker-compose.yaml
+++ b/docker_compose/gluetun/docker-compose.yaml
@@ -22,19 +22,19 @@ services:
       - '${TORRENT_WEBUI_PORT}'
       - '${TORRENT_INCOMMING_PORT}'
       - '${TORRENT_INCOMMING_PORT_UDP}'
-      - '${NICOTINE_PORT}'
+      - '${NICOTINE_PORTS}'  
       - '${NICOTINE_INCOMMING}'
     restart: unless-stopped
     labels:
       # Nicotine Automation
       - "npm.proxy.domains=nicotine"
-      - "npm.proxy.port=${NICOTINE_EXTERNAL_PORT}"
+      - "npm.proxy.port=${NICOTINE_UI_PORT}"
       - "npm.proxy.scheme=http"
       - "npm.proxy.websockets=true"
       - "pihole.custom-record=[[\"nicotine\", \"${DOCKER_HOST_IP}\"]]"
       # Torrent Automation
       - "npm.proxy.1.domains=torrent"
-      - "npm.proxy.1.port=${TORRENT_EXTERNAL_PORT}"
+      - "npm.proxy.1.port=${TORRENT_UI_PORT}"
       - "npm.proxy.1.scheme=http"
       - "npm.proxy.1.websockets=true"
       - "pihole.custom-record.1=[[\"torrent\", \"${DOCKER_HOST_IP}\"]]"
diff --git a/docker_compose/musicbrainz-picard/docker-compose.yaml b/docker_compose/musicbrainz-picard/docker-compose.yaml
index 2cc6c33..1407b47 100644
--- a/docker_compose/musicbrainz-picard/docker-compose.yaml
+++ b/docker_compose/musicbrainz-picard/docker-compose.yaml
@@ -11,6 +11,7 @@ services:
     volumes:
       - ${DATA_PATH}/config:/config:rw
       - music_nfs:/storage:rw
+      - downloads_nfs:/downloads:rw
     ports:
       - "${PICARD_PORT}:5800"
     restart: unless-stopped
@@ -21,4 +22,10 @@ volumes:
     driver_opts:
       type: nfs
       o: addr=${NAS_ADDR},nolock,soft,rw
-      device: :${MUSIC_PATH}
+      device: :${MEIDIA_PATH}/Music
+  downloads_nfs:
+    name: downloads_nfs_picard
+    driver_opts:
+      type: nfs
+      o: addr=${NAS_ADDR},nolock,soft,rw
+      device: :${MEIDIA_PATH}/downloads/nicotine
diff --git a/docker_compose/nicotine/docker-compose.yaml b/docker_compose/nicotine/docker-compose.yaml
index 28d007b..311974d 100644
--- a/docker_compose/nicotine/docker-compose.yaml
+++ b/docker_compose/nicotine/docker-compose.yaml
@@ -1,42 +1,22 @@
 # nicotine - https://github.com/sirjmann92/nicotineplus-proper
+# https://github.com/WB2024/WBs-Nicotineplusplus-docker
 ---
 services: 
  nicotineplus-proper:
-   image: 'ghcr.io/sirjmann92/nicotineplus-proper:latest' # Or pull from GitHub: 'ghcr.io/sirjmann92/nicotineplus-proper:latest'
+   image: 'wb20244/nicotineplus-xpra:latest'
    container_name: nicotine
-   network_mode: "container:gluetun" # Comment this line out if you're NOT using a VPN container
-   #ports: # Comment this line out if you're NOT using a VPN container (line above)
-     #- '${NICOTINE_PORT}:${NICOTINE_PORT}'
-     #- '2234:2234'
-   #env_file: .env # Optionally use a .env file to store environment variables and login credentials
-   environment: # All environment variables are optional, defaults are listed (TZ, LANG, UMASK, and FORWARD_PORT have no default)
-     - TZ=Your/Timezone
-     - LOGIN=${SOUL_SEEK_USERNAME}
-     - PASSW=${SOUL_SEEK_PASSWORD}
-  #   - PUID=1000
-  #   - PGID=1000
-     - DARKMODE=True
-  #   - LANG=C.UTF-8
-  #   - UMASK=022
-  #   - UPNP=False 
-  #   - AUTO_CONNECT=True
-  #   - TRAY_ICON=False
-  #   - NOTIFY_FILE=False
-  #   - NOTIFY_FOLDER=False
-  #   - NOTIFY_TITLE=False
-  #   - NOTIFY_PM=False
-  #   - NOTIFY_CHATROOM=False
-  #   - NOTIFY_MENTION=False
-  #   - FORWARD_PORT=12345 # Useful for dynamic port forwarding
-  #   - WEB_UI_PORT=${NICOTINE_PORT} # for custom webUI port assignment. Should match 'port' env variable or VPN webUI port
-  #   - WEB_UI_USER=YourWebUIUsername # for custom webUI basic auth username
-  #   - WEB_UI_PASSWORD=YourWebUIPassword # for custom webUI basic auth password
-  #   - HEALTHCHECK_ENABLED=false # Set to false to disable Docker healthcheck (default: true/enabled)
+   network_mode: "container:gluetun"
+   environment:
+     - TZ=America/New_York
+     - DISPLAY_PORT=6565
+     - NICOTINE_LOGIN=${SOUL_SEEK_USERNAME}
+     - NICOTINE_PASSWORD=${SOUL_SEEK_PASSWORD}
+     - PUID=1000
+     - PGID=1000
    volumes:
      - nicotine_downloads:/downloads
-     #- nicotine_shared:/shared
-     - ${DATA_PATH}/config:/config # Save your config persistently
-     - ${DATA_PATH}/data:/data # Store your logs, database, and history
+     - ${DATA_PATH}/config:/home/guiwebuser/.config/nicotine
+     - ${DATA_PATH}/data:/home/guiwebuser/.local/share/nicotine
    restart: unless-stopped
 
 volumes: