diff --git a/docker-compose.yml b/docker-compose.yml
index 641a797..bf4a148 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -229,6 +229,7 @@ services:
             - ${CONFIG}/jvb:/config:Z
         environment:
             - ENABLE_COLIBRI_WEBSOCKET
+            - ENABLE_OCTO
             - DOCKER_HOST_ADDRESS
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
@@ -245,6 +246,10 @@ services:
             - JVB_WS_DOMAIN
             - JVB_WS_SERVER_ID
             - PUBLIC_URL
+            - JVB_OCTO_BIND_ADDRESS
+            - JVB_OCTO_PUBLIC_ADDRESS
+            - JVB_OCTO_BIND_PORT
+            - JVB_OCTO_REGION
             - TZ
         depends_on:
             - prosody
diff --git a/jvb/rootfs/defaults/jvb.conf b/jvb/rootfs/defaults/jvb.conf
index 42a5925..8ba26c4 100644
--- a/jvb/rootfs/defaults/jvb.conf
+++ b/jvb/rootfs/defaults/jvb.conf
@@ -1,4 +1,5 @@
 {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "1" | toBool }}
+{{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }}
 {{ $JVB_TCP_PORT := .Env.JVB_TCP_PORT | default "4443" }}
 {{ $JVB_TCP_MAPPED_PORT := .Env.JVB_TCP_MAPPED_PORT | default $JVB_TCP_PORT }}
 {{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}}
@@ -13,9 +14,9 @@ videobridge {
         tcp {
             enabled = {{ not (.Env.JVB_TCP_HARVESTER_DISABLED | default "true" | toBool) }}
             port = {{ .Env.JVB_TCP_PORT }}
-{{ if not (eq $JVB_TCP_PORT $JVB_TCP_MAPPED_PORT) }}
+            {{ if not (eq $JVB_TCP_PORT $JVB_TCP_MAPPED_PORT) }}
             mapped-port = {{ $JVB_TCP_MAPPED_PORT }}
-{{ end }}
+            {{ end }}
         }
     }
     apis {
@@ -51,6 +52,16 @@ videobridge {
             port = 9090
         }
     }
+
+    {{ if $ENABLE_OCTO -}}
+    octo {
+        enabled = true
+        bind-address = "{{ .Env.JVB_OCTO_BIND_ADDRESS | default "0.0.0.0" }}"
+        public-address = "{{ .Env.JVB_OCTO_PUBLIC_ADDRESS }}"
+        bind-port = "{{ .Env.JVB_OCTO_BIND_PORT | default "4096" }}"
+        region = "{{ .Env.JVB_OCTO_REGION | default "europe" }}"
+    }
+    {{ end -}}
 }
 
 ice4j {