diff --git a/docker/sentrypeer/docker-compose.yml b/docker/sentrypeer/docker-compose.yml
index 9af74fd5..ec659070 100644
--- a/docker/sentrypeer/docker-compose.yml
+++ b/docker/sentrypeer/docker-compose.yml
@@ -13,9 +13,9 @@ services:
 #    cpu_count: 1
 #    cpus: 0.25
     environment:
-     - SENTRYPEER_WEB_GUI=1 
-     - SENTRYPEER_PEER_TO_PEER=1
-     - SENTRYPEER_BOOTSTRAP_NODE=bootstrap.sentrypeer.org
+#     - SENTRYPEER_WEB_GUI=0
+     - SENTRYPEER_PEER_TO_PEER=false
+#     - SENTRYPEER_BOOTSTRAP_NODE=bootstrap.sentrypeer.org
      - SENTRYPEER_VERBOSE=1
      - SENTRYPEER_DEBUG=1
     networks:
diff --git a/etc/compose/hive_sensor.yml b/etc/compose/hive_sensor.yml
index 66d8f077..db16863d 100644
--- a/etc/compose/hive_sensor.yml
+++ b/etc/compose/hive_sensor.yml
@@ -374,11 +374,11 @@ services:
   sentrypeer:
     container_name: sentrypeer
     restart: always
-    ## SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
-    ## In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
-    ## the bad actors in its logs. Therefore this option is opt-in based.
-    environment:
-     - SENTRYPEER_PEER_TO_PEER=0
+# SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
+# In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
+# the bad actors in its logs. Therefore this option is opt-in based.
+#    environment:
+#     - SENTRYPEER_PEER_TO_PEER=0
     networks:
      - sentrypeer_local
     ports:
diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml
index 9e2332ce..15cd5613 100644
--- a/etc/compose/sensor.yml
+++ b/etc/compose/sensor.yml
@@ -374,11 +374,11 @@ services:
   sentrypeer:
     container_name: sentrypeer
     restart: always
-    ## SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
-    ## In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
-    ## the bad actors in its logs. Therefore this option is opt-in based.
-    environment:
-     - SENTRYPEER_PEER_TO_PEER=0
+# SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
+# In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
+# the bad actors in its logs. Therefore this option is opt-in based.
+#    environment:
+#     - SENTRYPEER_PEER_TO_PEER=0
     networks:
      - sentrypeer_local
     ports:
diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml
index 63334f1d..e16cfd39 100644
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@@ -374,11 +374,11 @@ services:
   sentrypeer:
     container_name: sentrypeer
     restart: always
-    ## SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
-    ## In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
-    ## the bad actors in its logs. Therefore this option is opt-in based.
-    environment:
-     - SENTRYPEER_PEER_TO_PEER=0
+# SentryPeer offers to exchange bad actor data via DHT / P2P mode by setting the ENV to true (1)
+# In some cases (i.e. internally deployed T-Pots) this might be confusing as SentryPeer will show
+# the bad actors in its logs. Therefore this option is opt-in based.
+#    environment:
+#     - SENTRYPEER_PEER_TO_PEER=0
     networks:
      - sentrypeer_local
     ports: