diff --git a/.travis.yml b/.travis.yml
index a624269b0..168abc867 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -653,4 +653,22 @@ matrix:
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/staytus:latest staytus
-      - docker push epicmorg/staytus:latest
\ No newline at end of file
+      - docker push epicmorg/staytus:latest
+
+    - name: qBitTorrent - latest
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/qbittorrent:latest qbittorrent/latest
+      - docker push epicmorg/qbittorrent:latest
+
+    - name: qBitTorrent - unstable
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/qbittorrent:unstable qbittorrent/latest
+      - docker push epicmorg/qbittorrent:unstable
+
+    - name: qBitTorrent - stable
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/qbittorrent:stable qbittorrent/stable
+      - docker push epicmorg/qbittorrent:stable
diff --git a/_experemental/qbittorrent/latest/entrypoint.sh b/_experemental/qbittorrent/latest/entrypoint.sh
deleted file mode 100755
index 34539d071..000000000
--- a/_experemental/qbittorrent/latest/entrypoint.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles}
-: ${QBT_PROFILE_NAME:=docker}
-
-: ${SMB_ENABLED:=false}
-
-: ${SMB_DIR:=/mnt/smb}
-: ${SMB_IP:=10.10.10.10}
-: ${SMB_USER:=admin}
-: ${SMB_PASS:=password}
-: ${SMB_WORKGROUP:=WORKGROUP}
-: ${SMB_BIND:=/remote/folder}
-
-#mounting
-case $SMB_ENABLED in
-     true)
-          echo "SMB Mount enabled - trying to mount"
-          mount.cifs //${SMB_IP}${{SMB_BIND} ${SMB_DIR} -o username=${SMB_USER},password=${SMB_PASS},domain=${SMB_WORKGROUP},iocharset=utf8,file_mode=0777,dir_mode=0777,noperm,mapchars
-          ;;
-     false)
-          echo "SMD Disabled - skipping"
-          ;;
-esac
-
-#starting torrent
-qbittorrent-nox --profile=${QBT_PROFILES_DIR} --configuration=${QBT_PROFILE_NAME} --webui-port=8080
\ No newline at end of file
diff --git a/_experemental/qbittorrent/stable/entrypoint.sh b/_experemental/qbittorrent/stable/entrypoint.sh
deleted file mode 100755
index 34539d071..000000000
--- a/_experemental/qbittorrent/stable/entrypoint.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles}
-: ${QBT_PROFILE_NAME:=docker}
-
-: ${SMB_ENABLED:=false}
-
-: ${SMB_DIR:=/mnt/smb}
-: ${SMB_IP:=10.10.10.10}
-: ${SMB_USER:=admin}
-: ${SMB_PASS:=password}
-: ${SMB_WORKGROUP:=WORKGROUP}
-: ${SMB_BIND:=/remote/folder}
-
-#mounting
-case $SMB_ENABLED in
-     true)
-          echo "SMB Mount enabled - trying to mount"
-          mount.cifs //${SMB_IP}${{SMB_BIND} ${SMB_DIR} -o username=${SMB_USER},password=${SMB_PASS},domain=${SMB_WORKGROUP},iocharset=utf8,file_mode=0777,dir_mode=0777,noperm,mapchars
-          ;;
-     false)
-          echo "SMD Disabled - skipping"
-          ;;
-esac
-
-#starting torrent
-qbittorrent-nox --profile=${QBT_PROFILES_DIR} --configuration=${QBT_PROFILE_NAME} --webui-port=8080
\ No newline at end of file
diff --git a/_experemental/qbittorrent/stable/will_be_later b/_experemental/qbittorrent/stable/will_be_later
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/_experemental/qbittorrent/stable/will_be_later
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/_experemental/qbittorrent/latest/.docker-repository.yml b/qbittorrent/latest/.docker-repository.yml
similarity index 100%
rename from _experemental/qbittorrent/latest/.docker-repository.yml
rename to qbittorrent/latest/.docker-repository.yml
diff --git a/_experemental/qbittorrent/latest/.dockerignore b/qbittorrent/latest/.dockerignore
similarity index 100%
rename from _experemental/qbittorrent/latest/.dockerignore
rename to qbittorrent/latest/.dockerignore
diff --git a/_experemental/qbittorrent/latest/Dockerfile b/qbittorrent/latest/Dockerfile
similarity index 91%
rename from _experemental/qbittorrent/latest/Dockerfile
rename to qbittorrent/latest/Dockerfile
index 53c63f9bc..e09823fcc 100644
--- a/_experemental/qbittorrent/latest/Dockerfile
+++ b/qbittorrent/latest/Dockerfile
@@ -5,14 +5,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ENV BuildDocker true
-ARG SMB_DIR=/mnt/smb
 ARG QBT_DIR=/opt/qbittorrent
 
 ##################################################################
 #                   Files and folders
 ##################################################################
-RUN mkdir -p ${SMB_DIR} ${QBT_DIR}
+RUN mkdir -p ${QBT_DIR}
 
 ##################################################################
 #                   qBitTorrent sources list
@@ -26,10 +24,7 @@ RUN apt autoremove -y && apt update && apt dist-upgrade -y
 ##################################################################
 RUN apt-get update && \
     apt install -y --allow-unauthenticated --allow-downgrades \
-    qbittorrent-nox \
-    ntfs-3g \
-    winbind \
-    cifs-utils
+    qbittorrent-nox
 
 
 ##################################################################
@@ -47,6 +42,7 @@ RUN apt clean -y && \
 
 VOLUME ${QBT_DIR}
 
-EXPOSE 8080
+EXPOSE 8282
 
+COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT /entrypoint.sh
\ No newline at end of file
diff --git a/_experemental/qbittorrent/latest/Makefile b/qbittorrent/latest/Makefile
similarity index 100%
rename from _experemental/qbittorrent/latest/Makefile
rename to qbittorrent/latest/Makefile
diff --git a/_experemental/qbittorrent/latest/docker-compose.yml b/qbittorrent/latest/docker-compose.yml
similarity index 67%
rename from _experemental/qbittorrent/latest/docker-compose.yml
rename to qbittorrent/latest/docker-compose.yml
index 43e126daf..2979ec108 100644
--- a/_experemental/qbittorrent/latest/docker-compose.yml
+++ b/qbittorrent/latest/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     restart: always
     container_name: qbittorrent
     ports:
-      - "0.0.0.0:8080:8080"
+      - "0.0.0.0:8282:8282"
     volumes:
       - /etc/localtime:/etc/localtime
       - /etc/timezone:/etc/timezone
@@ -15,9 +15,4 @@ services:
       - /tmp
     environment:
       - QBT_PROFILE_NAME=docker
-      - SMB_ENABLED=true
-      - SMB_IP=10.10.10.10
-      - SMB_USER=admin
-      - SMB_PASS=password
-      - SMB_WORKGROUP=WORKGROUP
-      - SMB_BIND=/remote/folder
+
diff --git a/qbittorrent/latest/entrypoint.sh b/qbittorrent/latest/entrypoint.sh
new file mode 100755
index 000000000..12d1f9b45
--- /dev/null
+++ b/qbittorrent/latest/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles}
+: ${QBT_PROFILE_NAME:=docker}
+
+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/_experemental/qbittorrent/latest/qbittorrent-unstable.list b/qbittorrent/latest/qbittorrent-unstable.list
similarity index 100%
rename from _experemental/qbittorrent/latest/qbittorrent-unstable.list
rename to qbittorrent/latest/qbittorrent-unstable.list
diff --git a/_experemental/qbittorrent/stable/.docker-repository.yml b/qbittorrent/stable/.docker-repository.yml
similarity index 100%
rename from _experemental/qbittorrent/stable/.docker-repository.yml
rename to qbittorrent/stable/.docker-repository.yml
diff --git a/_experemental/qbittorrent/stable/.dockerignore b/qbittorrent/stable/.dockerignore
similarity index 100%
rename from _experemental/qbittorrent/stable/.dockerignore
rename to qbittorrent/stable/.dockerignore
diff --git a/qbittorrent/stable/Dockerfile b/qbittorrent/stable/Dockerfile
new file mode 100644
index 000000000..c88f99867
--- /dev/null
+++ b/qbittorrent/stable/Dockerfile
@@ -0,0 +1,48 @@
+FROM epicmorg/devel
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+ARG QBT_DIR=/opt/qbittorrent
+
+##################################################################
+#                   Files and folders
+##################################################################
+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 update && apt dist-upgrade -y
+
+############################# ####################################
+#                   qbittorrent install
+##################################################################
+RUN apt-get update && \
+    apt install -y --allow-unauthenticated --allow-downgrades \
+    qbittorrent-nox
+
+
+##################################################################
+#                   other   customisations
+##################################################################
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+VOLUME ${QBT_DIR}
+
+EXPOSE 8282
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT /entrypoint.sh
\ No newline at end of file
diff --git a/_experemental/qbittorrent/stable/Makefile b/qbittorrent/stable/Makefile
similarity index 64%
rename from _experemental/qbittorrent/stable/Makefile
rename to qbittorrent/stable/Makefile
index 610f20367..c5d44e370 100644
--- a/_experemental/qbittorrent/stable/Makefile
+++ b/qbittorrent/stable/Makefile
@@ -1,4 +1,4 @@
 all: emgqb
 emgqb:
 	docker build --compress -t epicmorg/qbittorrent:stable .
-
+	docker push epicmorg/qbittorrent:stable
diff --git a/qbittorrent/stable/docker-compose.yml b/qbittorrent/stable/docker-compose.yml
new file mode 100644
index 000000000..2979ec108
--- /dev/null
+++ b/qbittorrent/stable/docker-compose.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/qbittorrent/stable/entrypoint.sh b/qbittorrent/stable/entrypoint.sh
new file mode 100755
index 000000000..12d1f9b45
--- /dev/null
+++ b/qbittorrent/stable/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+: ${QBT_PROFILES_DIR:=/opt/qbittorrent/profiles}
+: ${QBT_PROFILE_NAME:=docker}
+
+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/_experemental/qbittorrent/stable/qbittorrent-stable.list b/qbittorrent/stable/qbittorrent-stable.list
similarity index 100%
rename from _experemental/qbittorrent/stable/qbittorrent-stable.list
rename to qbittorrent/stable/qbittorrent-stable.list