diff --git a/compose/docker-compose.override.yml-all b/compose/docker-compose.override.yml-all
index 5d7bd860..ef4c64b8 100644
--- a/compose/docker-compose.override.yml-all
+++ b/compose/docker-compose.override.yml-all
@@ -41,6 +41,25 @@ services:
       - php
       - httpd
 
+  # -----------------------------------------------------------------------------------------------
+  # Ngrok
+  # -----------------------------------------------------------------------------------------------
+  ngrok:
+    image: devilbox/ngrok:0.2
+    hostname: ngrok
+    environment:
+      - HTTP_TUNNELS=${NGROK_HTTP_TUNNELS:-httpd:httpd:80}
+      - AUTHTOKEN=${NGROK_AUTHTOKEN:-}
+    ports:
+      - "${LOCAL_LISTEN_ADDR}${HOST_PORT_NGROK:-4040}:4040"
+    networks:
+      app_net:
+        ipv4_address: 172.16.238.202
+    depends_on:
+      - bind
+      - php
+      - httpd
+
   # -----------------------------------------------------------------------------------------------
   # RabbitMQ
   # -----------------------------------------------------------------------------------------------
diff --git a/compose/docker-compose.override.yml-ngrok b/compose/docker-compose.override.yml-ngrok
new file mode 100644
index 00000000..55b4e282
--- /dev/null
+++ b/compose/docker-compose.override.yml-ngrok
@@ -0,0 +1,23 @@
+# vim: set ft=yaml:
+version: '2.1'
+
+services:
+
+  # -----------------------------------------------------------------------------------------------
+  # Ngrok
+  # -----------------------------------------------------------------------------------------------
+  ngrok:
+    image: devilbox/ngrok:0.2
+    hostname: ngrok
+    environment:
+      - HTTP_TUNNELS=${NGROK_HTTP_TUNNELS:-httpd:httpd:80}
+      - AUTHTOKEN=${NGROK_AUTHTOKEN:-}
+    ports:
+      - "${LOCAL_LISTEN_ADDR}${HOST_PORT_NGROK:-4040}:4040"
+    networks:
+      app_net:
+        ipv4_address: 172.16.238.202
+    depends_on:
+      - bind
+      - php
+      - httpd