diff --git a/linux/qbittorrent/latest/Makefile b/linux/qbittorrent/latest/Makefile
index 0f3f4b602..82c5a2de6 100644
--- a/linux/qbittorrent/latest/Makefile
+++ b/linux/qbittorrent/latest/Makefile
@@ -1,4 +1,5 @@
-all: emgqb
-emgqb:
-	docker build --compress -t epicmorg/qbittorrent:latest .
-	docker push epicmorg/qbittorrent:latest
\ No newline at end of file
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/qbittorrent/latest/docker-compose.example.yml b/linux/qbittorrent/latest/docker-compose.example.yml
new file mode 100644
index 000000000..2979ec108
--- /dev/null
+++ b/linux/qbittorrent/latest/docker-compose.example.yml
@@ -0,0 +1,18 @@
+version: '3.7'
+services:
+  qbittorrent:
+    image: epicmorg/qbittorrent:latest
+    restart: always
+    container_name: qbittorrent
+    ports:
+      - "0.0.0.0:8282:8282"
+    volumes:
+      - /etc/localtime:/etc/localtime
+      - /etc/timezone:/etc/timezone
+      - /etc/letsencrypt:/etc/letsencrypt
+      - /opt/qbittorrent/profiles:/opt/qbittorrent/profiles
+    tmpfs:
+      - /tmp
+    environment:
+      - QBT_PROFILE_NAME=docker
+
diff --git a/linux/qbittorrent/latest/docker-compose.yml b/linux/qbittorrent/latest/docker-compose.yml
index 2979ec108..0c0196593 100644
--- a/linux/qbittorrent/latest/docker-compose.yml
+++ b/linux/qbittorrent/latest/docker-compose.yml
@@ -1,18 +1,10 @@
-version: '3.7'
+version: '3.9'
 services:
-  qbittorrent:
-    image: epicmorg/qbittorrent:latest
-    restart: always
-    container_name: qbittorrent
-    ports:
-      - "0.0.0.0:8282:8282"
-    volumes:
-      - /etc/localtime:/etc/localtime
-      - /etc/timezone:/etc/timezone
-      - /etc/letsencrypt:/etc/letsencrypt
-      - /opt/qbittorrent/profiles:/opt/qbittorrent/profiles
-    tmpfs:
-      - /tmp
-    environment:
-      - QBT_PROFILE_NAME=docker
-
+  app:
+    image: "epicmorg/qbittorrent:latest"
+    build:
+      context: .
+  app-unstable:
+    image: "epicmorg/qbittorrent:unstable"
+    build:
+      context: .
diff --git a/linux/qbittorrent/stable/Makefile b/linux/qbittorrent/stable/Makefile
index c5d44e370..82c5a2de6 100644
--- a/linux/qbittorrent/stable/Makefile
+++ b/linux/qbittorrent/stable/Makefile
@@ -1,4 +1,5 @@
-all: emgqb
-emgqb:
-	docker build --compress -t epicmorg/qbittorrent:stable .
-	docker push epicmorg/qbittorrent:stable
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/qbittorrent/stable/docker-compose.yml b/linux/qbittorrent/stable/docker-compose.yml
index 2979ec108..7d9e5f914 100644
--- a/linux/qbittorrent/stable/docker-compose.yml
+++ b/linux/qbittorrent/stable/docker-compose.yml
@@ -1,18 +1,6 @@
-version: '3.7'
+version: '3.9'
 services:
-  qbittorrent:
-    image: epicmorg/qbittorrent:latest
-    restart: always
-    container_name: qbittorrent
-    ports:
-      - "0.0.0.0:8282:8282"
-    volumes:
-      - /etc/localtime:/etc/localtime
-      - /etc/timezone:/etc/timezone
-      - /etc/letsencrypt:/etc/letsencrypt
-      - /opt/qbittorrent/profiles:/opt/qbittorrent/profiles
-    tmpfs:
-      - /tmp
-    environment:
-      - QBT_PROFILE_NAME=docker
-
+  app:
+    image: "epicmorg/qbittorrent:stable"
+    build:
+      context: .