diff --git a/linux/ecosystem/qbittorrent/latest/Dockerfile b/linux/ecosystem/qbittorrent/Dockerfile
similarity index 91%
rename from linux/ecosystem/qbittorrent/latest/Dockerfile
rename to linux/ecosystem/qbittorrent/Dockerfile
index fa1858165..c759c1b11 100644
--- a/linux/ecosystem/qbittorrent/latest/Dockerfile
+++ b/linux/ecosystem/qbittorrent/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/debian:bullseye
+FROM epicmorg/debian:bookworm
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -15,8 +15,8 @@ RUN mkdir -p ${QBT_DIR}
 ##################################################################
 #                   qBitTorrent sources list
 ##################################################################
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4
-COPY qbittorrent-unstable.list /etc/apt/sources.list.d/qbittorrent-unstable.list
+#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4
+#COPY qbittorrent-unstable.list /etc/apt/sources.list.d/qbittorrent-unstable.list
 RUN apt autoremove -y && apt purge policykit-1 -y &&  apt update && apt dist-upgrade -y
 
 ############################# ####################################
diff --git a/linux/ecosystem/qbittorrent/stable/Dockerfile b/linux/ecosystem/qbittorrent/Dockerfile.stable
similarity index 88%
rename from linux/ecosystem/qbittorrent/stable/Dockerfile
rename to linux/ecosystem/qbittorrent/Dockerfile.stable
index 0d451e1f2..e4d9aea01 100644
--- a/linux/ecosystem/qbittorrent/stable/Dockerfile
+++ b/linux/ecosystem/qbittorrent/Dockerfile.stable
@@ -15,9 +15,9 @@ RUN mkdir -p ${QBT_DIR}
 ##################################################################
 #                   qBitTorrent sources list
 ##################################################################
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4
-COPY qbittorrent-stable.list /etc/apt/sources.list.d/qbittorrent-stable.list
-RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y
+#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4
+#COPY qbittorrent-stable.list /etc/apt/sources.list.d/qbittorrent-stable.list
+#RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y
 
 ############################# ####################################
 #                   qbittorrent install
diff --git a/linux/ecosystem/qbittorrent/Makefile b/linux/ecosystem/qbittorrent/Makefile
new file mode 100644
index 000000000..85f84d084
--- /dev/null
+++ b/linux/ecosystem/qbittorrent/Makefile
@@ -0,0 +1,34 @@
+all: app
+
+app:
+	make build
+	make deploy
+	make clean
+
+build:
+	make qbt-latest
+	make qbt-unstable
+	make qbt-stable
+
+deploy:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
+
+qbt-latest:
+	docker-compose build --compress --parallel qbt-latest
+	docker-compose push qbt-latest
+
+
+qbt-unstable:
+	docker-compose build --compress --parallel qbt-unstable
+	docker-compose push qbt-unstable
+
+qbt-stable:
+	docker-compose build --compress --parallel qbt-stable
+	docker-compose push qbt-stable
diff --git a/linux/ecosystem/qbittorrent/latest/docker-compose.example.yml b/linux/ecosystem/qbittorrent/docker-compose.example.yml
similarity index 100%
rename from linux/ecosystem/qbittorrent/latest/docker-compose.example.yml
rename to linux/ecosystem/qbittorrent/docker-compose.example.yml
diff --git a/linux/ecosystem/qbittorrent/latest/docker-compose.yml b/linux/ecosystem/qbittorrent/docker-compose.yml
similarity index 52%
rename from linux/ecosystem/qbittorrent/latest/docker-compose.yml
rename to linux/ecosystem/qbittorrent/docker-compose.yml
index 0c0196593..3acac9281 100644
--- a/linux/ecosystem/qbittorrent/latest/docker-compose.yml
+++ b/linux/ecosystem/qbittorrent/docker-compose.yml
@@ -1,10 +1,15 @@
 version: '3.9'
 services:
-  app:
+  qbt-latest:
     image: "epicmorg/qbittorrent:latest"
     build:
       context: .
-  app-unstable:
+  qbt-unstable:
     image: "epicmorg/qbittorrent:unstable"
     build:
       context: .
+  qbt-stable:
+    image: "epicmorg/qbittorrent:stable"
+    build:
+      context: .
+      dockerfile: Dockerfile.stable
\ No newline at end of file
diff --git a/linux/ecosystem/qbittorrent/latest/docker-entrypoint.sh b/linux/ecosystem/qbittorrent/docker-entrypoint.sh
similarity index 100%
rename from linux/ecosystem/qbittorrent/latest/docker-entrypoint.sh
rename to linux/ecosystem/qbittorrent/docker-entrypoint.sh
diff --git a/linux/ecosystem/qbittorrent/latest/Makefile b/linux/ecosystem/qbittorrent/latest/Makefile
deleted file mode 100644
index bad6d73b5..000000000
--- a/linux/ecosystem/qbittorrent/latest/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --parallel
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
diff --git a/linux/ecosystem/qbittorrent/latest/Makefile.unstable b/linux/ecosystem/qbittorrent/latest/Makefile.unstable
deleted file mode 100644
index 23be3ca19..000000000
--- a/linux/ecosystem/qbittorrent/latest/Makefile.unstable
+++ /dev/null
@@ -1,4 +0,0 @@
-all: emgqb
-emgqb:
-	docker build --compress -t epicmorg/qbittorrent:unstable .
-	docker push epicmorg/qbittorrent:unstable
diff --git a/linux/ecosystem/qbittorrent/latest/qbittorrent-unstable.list b/linux/ecosystem/qbittorrent/latest/qbittorrent-unstable.list
deleted file mode 100644
index f6ecdaf6d..000000000
--- a/linux/ecosystem/qbittorrent/latest/qbittorrent-unstable.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main
-deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main
diff --git a/linux/ecosystem/qbittorrent/stable/Makefile b/linux/ecosystem/qbittorrent/stable/Makefile
deleted file mode 100644
index bad6d73b5..000000000
--- a/linux/ecosystem/qbittorrent/stable/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --parallel
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
diff --git a/linux/ecosystem/qbittorrent/stable/docker-compose.yml b/linux/ecosystem/qbittorrent/stable/docker-compose.yml
deleted file mode 100644
index 7d9e5f914..000000000
--- a/linux/ecosystem/qbittorrent/stable/docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/qbittorrent:stable"
-    build:
-      context: .
diff --git a/linux/ecosystem/qbittorrent/stable/docker-entrypoint.sh b/linux/ecosystem/qbittorrent/stable/docker-entrypoint.sh
deleted file mode 100755
index 1f88e6343..000000000
--- a/linux/ecosystem/qbittorrent/stable/docker-entrypoint.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles}
-: ${QBT_PROFILE_NAME:=docker}
-
-export LC_ALL=ru_RU.UTF-8
-
-echo "Starting qBitTorrent..."
-qbittorrent-nox --profile=${QBT_PROFILES_DIR} --configuration=${QBT_PROFILE_NAME} --webui-port=8282
\ No newline at end of file
diff --git a/linux/ecosystem/qbittorrent/stable/qbittorrent-stable.list b/linux/ecosystem/qbittorrent/stable/qbittorrent-stable.list
deleted file mode 100644
index f3d38943c..000000000
--- a/linux/ecosystem/qbittorrent/stable/qbittorrent-stable.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main
-deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main
diff --git a/linux/ecosystem/retracker/Dockerfile b/linux/ecosystem/retracker/Dockerfile
index 5314c8c76..5ded9536d 100644
--- a/linux/ecosystem/retracker/Dockerfile
+++ b/linux/ecosystem/retracker/Dockerfile
@@ -10,6 +10,7 @@ ENV RETRACKER_PORT=80
 ENV RETRACKER_MINUTS=180
 ENV RETRACKER_DEBUG=false
 ENV RETRACKER_REAL_IP=true
+ENV RETRACKER_OPTS=
 
 RUN retracker -v
 
diff --git a/linux/ecosystem/retracker/docker-entrypoint.sh b/linux/ecosystem/retracker/docker-entrypoint.sh
index 50686513e..e3a943fc6 100755
--- a/linux/ecosystem/retracker/docker-entrypoint.sh
+++ b/linux/ecosystem/retracker/docker-entrypoint.sh
@@ -6,6 +6,8 @@ set -euo pipefail
 : ${RETRACKER_MINUTS:=180}
 : ${RETRACKER_DEBUG:=false}
 : ${RETRACKER_REAL_IP:=true}
+: ${RETRACKER_OPTS:=}
+
 re='^[0-9]+$'