diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml
index d1d7feb..9f76ae3 100644
--- a/templates/docker-compose.yml
+++ b/templates/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     restart: "always"
 
   peertube:
-    image: chocobozzz/peertube:v1.2.1-stretch
+    image: chocobozzz/peertube:v1.3.0-rc.1-stretch
     env_file:
       - .env
     volumes:
@@ -72,3 +72,10 @@ services:
     environment:
       - POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
     restart: "always"
+
+networks:
+  default:
+    ipam:
+      driver: default
+      config:
+      - subnet:  172.18.0.0/16
diff --git a/templates/env b/templates/env
index ff1469e..1b8e3db 100644
--- a/templates/env
+++ b/templates/env
@@ -1,7 +1,7 @@
 PEERTUBE_WEBSERVER_HOSTNAME={{ domain }}
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
-PEERTUBE_TRUST_PROXY=["127.0.0.1"]
+PEERTUBE_TRUST_PROXY=["127.0.0.1", "172.18.0.0/16"]
 PEERTUBE_SMTP_HOSTNAME=postfix
 PEERTUBE_SMTP_PORT=25
 PEERTUBE_SMTP_FROM=info@{{ domain }}