diff --git a/jdownloader2/docker-compose.yml b/jdownloader2/docker-compose.yml
new file mode 100644
index 0000000..759986b
--- /dev/null
+++ b/jdownloader2/docker-compose.yml
@@ -0,0 +1,9 @@
+services:
+    jdownloader-2:
+        container_name: jdownloader-2
+        ports:
+            - 5800:5800
+        volumes:
+            - /home/ccalifice/docker-data/jdownloader-2:/config:rw
+            - /mnt/system/jdownloader2:/output:rw
+        image: jlesage/jdownloader-2
diff --git a/servarr/docker-compose.yml b/servarr/docker-compose.yml
index cc4099c..459a3a4 100644
--- a/servarr/docker-compose.yml
+++ b/servarr/docker-compose.yml
@@ -86,7 +86,7 @@ services:
       networks:
         - jellyseer
 
-  flaresolverr:    
+  flaresolverr:
     image: ghcr.io/flaresolverr/flaresolverr:latest
     container_name: flaresolverr
     environment:
@@ -98,6 +98,45 @@ services:
       - "${PORT:-8191}:8191"
     restart: unless-stopped
 
+  cleanuparr:
+    image: ghcr.io/cleanuparr/cleanuparr:latest
+    container_name: cleanuparr
+    restart: unless-stopped
+    ports:
+      - "11011:11011"
+    volumes:
+      - /home/ccalifice/docker-data/cleanuparr:/config
+      # Mount your downloads directory if needed
+      - /mnt/servarr/data/torrents:/downloads
+    environment:
+      - PORT=11011
+      - BASE_PATH=
+      - PUID=1000
+      - PGID=1002
+      - UMASK=022
+      - TZ=America/Sao_Paulo
+    # Health check configuration
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:11011/health"]
+      interval: 30s        # Check every 30 seconds
+      timeout: 10s         # Allow up to 10 seconds for response
+      start_period: 30s    # Wait 30 seconds before first check
+      retries: 3           # Mark unhealthy after 3 consecutive failures
+
+  huntarr:
+    image: ghcr.io/plexguide/huntarr:latest
+    container_name: huntarr
+    restart: always
+    ports:
+      - "9705:9705"
+    volumes:
+      - /home/ccalifice/docker-data/huntarr:/config
+    environment:
+      - TZ=America/Sao_Paulo
+
+#revocery-key: light-tower-river-95
+
+
   # jackett:
   #   image: lscr.io/linuxserver/jackett:latest
   #   container_name: jackett