diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml
index 31a2ae00..b70977a3 100644
--- a/docker/tanner/docker-compose.yml
+++ b/docker/tanner/docker-compose.yml
@@ -23,6 +23,8 @@ services:
     container_name: tanner_phpox
     restart: always
     stop_signal: SIGKILL
+    tmpfs:
+     - /tmp:uid=2000,gid=2000
     tty: true
     networks:
      - tanner_local
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index e7216468..2a23ec05 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -19,6 +19,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 # Setup Tanner
     git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
     cd /opt/tanner/ && \
+    git fetch origin pull/364/head:test && \	
+    git checkout test && \
     cp /root/dist/config.py /opt/tanner/tanner/ && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
diff --git a/docker/tanner/tanner/dist/config.py b/docker/tanner/tanner/dist/config.py
index 54a836aa..f1e75e1b 100644
--- a/docker/tanner/tanner/dist/config.py
+++ b/docker/tanner/tanner/dist/config.py
@@ -13,10 +13,10 @@ config_template = {'DATA': {'db_config': '/opt/tanner/db/db_config.json',
                             'tornado': '/opt/tanner/data/tornado.py',
                             'mako': '/opt/tanner/data/mako.py'
                             },                            
-                   'TANNER': {'host': '0.0.0.0', 'port': 8090},
-                   'WEB': {'host': '0.0.0.0', 'port': 8091},
-                   'API': {'host': '0.0.0.0', 'port': 8092, 'auth': False, 'auth_signature': 'tanner_api_auth'},
-                   'PHPOX': {'host': '0.0.0.0', 'port': 8088},
+                   'TANNER': {'host': 'tanner', 'port': 8090},
+                   'WEB': {'host': 'tanner_web', 'port': 8091},
+                   'API': {'host': 'tanner_api', 'port': 8092, 'auth': False, 'auth_signature': 'tanner_api_auth'},
+                   'PHPOX': {'host': 'tanner_phpox', 'port': 8088},
                    'REDIS': {'host': 'tanner_redis', 'port': 6379, 'poolsize': 80, 'timeout': 1},
                    'EMULATORS': {'root_dir': '/opt/tanner'},
                    'EMULATOR_ENABLED': {'sqli': True, 'rfi': True, 'lfi': False, 'xss': True, 'cmd_exec': False,
@@ -25,6 +25,7 @@ config_template = {'DATA': {'db_config': '/opt/tanner/db/db_config.json',
                    'SQLI': {'type': 'SQLITE', 'db_name': 'tanner_db', 'host': 'localhost', 'user': 'root',
                             'password': 'user_pass'},
                    'XXE_INJECTION': {'OUT_OF_BAND': False},
+                   'RFI': {"allow_insecure": True},
                    'DOCKER': {'host_image': 'busybox:latest'},
                    'LOGGER': {'log_debug': '/tmp/tanner/tanner.log', 'log_err': '/tmp/tanner/tanner.err'},
                    'MONGO': {'enabled': False, 'URI': 'mongodb://localhost'},