diff --git a/.drone.yml b/.drone.yml
index ee65f89..4a770bb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,9 +25,9 @@ steps:
       from_secret: telegram_group_id
     message: >
       {{#success build.status}}
-        build {{build.link}} triggerd by {{commit.link}} from {{commit.author}} succeeded
+        SUCCESSED! build {{build.link}} triggerd by {{commit.link}} from {{commit.author}}
       {{else}}
-        build {{build.link}} triggerd by {{commit.link}} from {{commit.author}} failed
+        FAILED! build {{build.link}} triggerd by {{commit.link}} from {{commit.author}}
       {{/success}}
   when:
     status:
diff --git a/Dockerfile b/Dockerfile
index 3803bf6..bd23b05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,30 @@
-FROM paramah/base:alpine as base-config
+FROM travix/base-alpine:3.5 as builder
 
-FROM alpine
+ENV TINYPROXY_VERSION=1.11.0-rc1
+
+RUN adduser -D -u 2000 -h /var/run/tinyproxy -s /sbin/nologin tinyproxy tinyproxy \
+  && apk --update add -t build-dependencies \
+    make \
+    automake \
+    autoconf \
+    g++ \
+    asciidoc \
+    git \
+  && rm -rf /var/cache/apk/* \
+  && git clone -b ${TINYPROXY_VERSION} --depth=1 https://github.com/tinyproxy/tinyproxy.git /tmp/tinyproxy \
+  && cd /tmp/tinyproxy \
+  && ./autogen.sh \
+  && ./configure --enable-transparent --prefix="" \
+  && make \
+  && make install
+
+FROM alpine:3.5
 MAINTAINER Aleksander Cynarski <aleksander@cynarski.pl>
 
-COPY --from=base-config /etc/supervisor /etc/supervisor
 RUN set -xe \
-    && apk add --no-cache wget curl bash openssh supervisor tinyproxy \
-    && sed -i -e '/^Allow /s/^/#/' \
-              -e '/^ConnectPort /s/^/#/' \
-              -e '/^#DisableViaHeader /s/^#//' \
-              /etc/tinyproxy/tinyproxy.conf
+    && apk add --no-cache wget curl bash openssh
+
+COPY --from=builder /bin/tinyproxy /usr/bin/tinyproxy
 
 ENV DOCKERIZE_VERSION v0.6.1
 # Install dockerize
@@ -18,7 +33,9 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 COPY docker/etc /etc
+COPY docker/*-entrypoint.sh /usr/sbin/
 
 EXPOSE 8888
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]       
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["/usr/bin/tinyproxy", "-d"]       
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9cf2101
--- /dev/null
+++ b/README.md
@@ -0,0 +1,19 @@
+# Tinyproxy 1.11.0-rc1
+
+## Usage (docker-compose)
+
+
+```
+version: "3.5"
+
+services:
+  tinyproxy:
+    image: paramah/tinyproxy
+    networks:
+      - proxy_network
+    ports:
+      - "8888:8888"
+    environment:
+      TINYPROXY_TIMEOUT: 10
+      TINYPROXY_MAXCLIENTS: 200
+```
\ No newline at end of file
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
new file mode 100755
index 0000000..f7ea04d
--- /dev/null
+++ b/docker/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+echo "Configure tinyproxy"
+dockerize -template /etc/tinyproxy/tinyproxy.conf.template:/etc/tinyproxy/tinyproxy.conf
+echo "Done."
+
+exec "$@"
+
diff --git a/docker/etc/supervisor/services/.gitkeep b/docker/etc/supervisor/services/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/etc/supervisor/services/tinyproxy.conf b/docker/etc/supervisor/services/tinyproxy.conf
deleted file mode 100644
index 3a49486..0000000
--- a/docker/etc/supervisor/services/tinyproxy.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[program:tinyproxy]
-command=/usr/bin/tinyproxy -d
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-redirect_stderr=true
diff --git a/docker/etc/tinyproxy/tinyproxy.conf.template b/docker/etc/tinyproxy/tinyproxy.conf.template
new file mode 100644
index 0000000..ccbad14
--- /dev/null
+++ b/docker/etc/tinyproxy/tinyproxy.conf.template
@@ -0,0 +1,4 @@
+Port 8888
+Timeout {{ default .Env.TINYPROXY_TIMEOUT "60" }}
+LogLevel Info
+MaxClients {{ default .Env.TINYPROXY_MAXCLIENTS "100" }}