diff --git a/docker-compose.yml b/docker-compose.yml
index 0028a25..1511fab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -456,6 +456,7 @@ services:
             - AUTOSCALER_SIDECAR_REGION
             - AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL
             - AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL
+            - DISABLE_AWS_HARVESTER
             - DOCKER_HOST_ADDRESS
             - ENABLE_COLIBRI_WEBSOCKET
             - ENABLE_JVB_XMPP_SERVER
diff --git a/jvb/rootfs/defaults/jvb.conf b/jvb/rootfs/defaults/jvb.conf
index 2b15866..e49fd5e 100644
--- a/jvb/rootfs/defaults/jvb.conf
+++ b/jvb/rootfs/defaults/jvb.conf
@@ -1,4 +1,5 @@
 {{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool -}}
+{{ $DISABLE_AWS_HARVESTER := .Env.DISABLE_AWS_HARVESTER | default "false" | toBool -}}
 {{ $DISABLE_XMPP := .Env.JVB_DISABLE_XMPP | default "0" | toBool -}}
 {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "0" | toBool -}}
 {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool -}}
@@ -137,6 +138,9 @@ jmt {
 ice4j {
     harvest {
         mapping {
+            aws {
+                enabled = {{ not $DISABLE_AWS_HARVESTER }}
+            }
             stun {
 {{ if not $JVB_DISABLE_STUN -}}
                 addresses = [ "{{ join "\",\"" (splitList "," $JVB_STUN_SERVERS) }}" ]