diff --git a/.gitmodules b/.gitmodules
index e3ef3b6..0f8f6f4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "vpn"]
 	path = vpn
 	url = ssh://git@git.dlii.tech:222/Autoplex/vpn.git
+[submodule "torrent-client-v2"]
+	path = torrent-client-v2
+	url = ssh://git@git.dlii.tech:222/Autoplex/torrent-client-v2.git
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 51d4668..895ae65 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -31,9 +31,9 @@ services:
 
   torrent_client:
     build:
-      target: base
+      target: base-dev
     volumes:
-      - ./torrent-client:/app
+      - ./torrent-client-v2:/app
     # ulimits:
       # core:
       #   hard: -1
diff --git a/docker-compose.yml b/docker-compose.yml
index 29de23f..c445087 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,14 +63,36 @@ services:
     volumes:
       - var:/var/autoplex
 
+  # torrent_client:
+  #   build:
+  #     context: ./torrent-client
+  #   depends_on:
+  #     - "database"
+  #     - "vpn"
+  #   env_file:
+  #     - ./torrent-client/.env
+  #   healthcheck:
+  #     test: ["CMD", "ping", "-q", "-c1", "google.com"]
+  #     interval: 5m
+  #     timeout: 10s
+  #     retries: 3
+  #     start_period: 5m
+  #   network_mode: service:vpn
+  #   restart: unless-stopped
+  #   secrets:
+  #     - mysql_root_password
+  #   user: ${UID}:${GID}
+  #   volumes:
+  #     - ./.volumes/storage:/storage/default
+  #     - var:/var/autoplex
+
   torrent_client:
     build:
-      context: ./torrent-client
+      context: ./torrent-client-v2
     depends_on:
-      - "database"
       - "vpn"
     env_file:
-      - ./torrent-client/.env
+      - ./torrent-client-v2/.env
     healthcheck:
       test: ["CMD", "ping", "-q", "-c1", "google.com"]
       interval: 5m
@@ -79,8 +101,6 @@ services:
       start_period: 5m
     network_mode: service:vpn
     restart: unless-stopped
-    secrets:
-      - mysql_root_password
     user: ${UID}:${GID}
     volumes:
       - ./.volumes/storage:/storage/default
diff --git a/torrent-client-v2 b/torrent-client-v2
new file mode 160000
index 0000000..bffe124
--- /dev/null
+++ b/torrent-client-v2
@@ -0,0 +1 @@
+Subproject commit bffe12462bcc5c9ee0f2c7dfb15bc74ee96ac968