diff --git a/Dockerfile b/Dockerfile
index 9699fc9..01cf30a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,13 @@
-FROM ubuntu:14.04
-MAINTAINER Matthias Kadenbach <matthias.kadenbach@gmail.com>
-
-RUN echo 'deb http://deb.torproject.org/torproject.org trusty main' | tee /etc/apt/sources.list.d/torproject.list
-RUN gpg --keyserver keys.gnupg.net --recv 886DDD89
-RUN gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
-
-RUN echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' | tee /etc/apt/sources.list.d/ruby.list
-RUN gpg --keyserver keyserver.ubuntu.com --recv C3173AA6
-RUN gpg --export 80f70e11f0f0d5f10cb20e62f5da5f09c3173aa6 | apt-key add -
+FROM ubuntu:22.04
+LABEL org.opencontainers.image.authors="matthias.kadenbach@gmail.com"
 
 RUN apt-get update && \
-    apt-get install -y tor polipo haproxy ruby2.1 libssl-dev wget curl build-essential zlib1g-dev libyaml-dev libssl-dev && \
+    apt-get install -y tor haproxy ruby-full libssl-dev wget curl build-essential zlib1g-dev libyaml-dev libssl-dev netcat && \
     ln -s /lib/x86_64-linux-gnu/libssl.so.1.0.0 /lib/libssl.so.1.0.0
 
+RUN wget http://archive.ubuntu.com/ubuntu/pool/universe/p/polipo/polipo_1.1.1-8_amd64.deb
+RUN dpkg -i polipo_1.1.1-8_amd64.deb
+
 RUN update-rc.d -f tor remove
 RUN update-rc.d -f polipo remove
 
diff --git a/haproxy.cfg.erb b/haproxy.cfg.erb
index 6812e34..62ebd4c 100644
--- a/haproxy.cfg.erb
+++ b/haproxy.cfg.erb
@@ -14,14 +14,15 @@ defaults
   timeout server 60s
 
 
-listen stats *:4444
+listen stats
+  bind *:4444
   mode            http
   log             global
   maxconn 10
-  clitimeout      100s
-  srvtimeout      100s
-  contimeout      100s
-  timeout queue   100s
+  timeout client      100s
+  timeout server      100s
+  timeout connect     100s
+  timeout queue       100s
   stats enable
   stats hide-version
   stats refresh 30s
@@ -35,7 +36,6 @@ frontend rotating_proxies
   option http_proxy
 
 backend tor
-  option http_proxy
   balance leastconn # http://cbonte.github.io/haproxy-dconv/configuration-1.5.html#balance
 
   <% backends.each do |b| %>