diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf6c01eb8..fb17a5758 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 	* improved `Makefile`s.
 	* fixed `nextcloud` images.
 		* splited `nextcloud` images to `pure` and `patched` (`zipstreamer`) tags.
+	* added `torrserver`
 * `september`
 	* added [ArekSredzki/electron-release-server](https://github.com/ArekSredzki/electron-release-server/) support.
 	* fully reworked `teamcity-agent` images.
diff --git a/Makefile b/Makefile
index 437af375b..0e4e27d82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
-VERSION             =  "2021.11.01"
+VERSION             =  "2021.11.12"
+AUTHOR              =  "EpicMorg"
+MODIFIED            =  "AlexZ"
 DOCKER_SCAN_SUGGEST = false
 
 all: app
@@ -121,6 +123,8 @@ ecosystem-images:
 	cd `pwd`/linux/ecosystem/apache2/php7.4         && pwd && make
 
 	cd `pwd`/linux/ecosystem/testrail              && pwd && make
+	
+	cd `pwd`/linux/ecosystem/torrserver            && pwd && make
 
 	cd `pwd`/linux/ecosystem/postgres/latest       && pwd && make
 	cd `pwd`/linux/ecosystem/postgres/8.2          && pwd && make
diff --git a/linux/ecosystem/torrserver/Dockerfile b/linux/ecosystem/torrserver/Dockerfile
new file mode 100644
index 000000000..e09511a9a
--- /dev/null
+++ b/linux/ecosystem/torrserver/Dockerfile
@@ -0,0 +1,27 @@
+FROM epicmorg/edge
+
+#ARG TORRSERVER_LINK=https://releases.yourok.ru/torr/server/TorrServer-linux-amd64
+ARG TORRSERVER_LINK=https://github.com/YouROK/TorrServer/releases/latest/download/TorrServer-linux-amd64
+
+WORKDIR /opt
+
+ADD $TORRSERVER_LINK torrServer
+
+RUN \
+  apt-get update && \
+  apt-get upgrade -y && \
+  export GODEBUG=madvdontneed=1 && \
+  chmod +x torrServer 
+
+ENV UI_PORT 8090
+ENV UPNP_PORT 32000
+
+EXPOSE \ 
+  $UI_PORT \
+  $UPNP_PORT \
+  $UPNP_PORT/udp
+  
+VOLUME \
+  /config
+
+ENTRYPOINT /opt/torrServer --port $UI_PORT -path /config
\ No newline at end of file
diff --git a/linux/ecosystem/torrserver/Makefile b/linux/ecosystem/torrserver/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/torrserver/Makefile
@@ -0,0 +1,19 @@
+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/torrserver/docker-compose.yml b/linux/ecosystem/torrserver/docker-compose.yml
new file mode 100644
index 000000000..304ebd6a9
--- /dev/null
+++ b/linux/ecosystem/torrserver/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/torrserver:latest"
+    build:
+      context: .