diff --git a/docker/sentrypeer/Dockerfile b/docker/sentrypeer/Dockerfile
index 17155dea..47fe3494 100644
--- a/docker/sentrypeer/Dockerfile
+++ b/docker/sentrypeer/Dockerfile
@@ -17,4 +17,4 @@ RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
 # Set workdir and start sentrypeer
 STOPSIGNAL SIGKILL
 USER sentrypeer:sentrypeer
-CMD /usr/bin/sentrypeer -warpj -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json
+CMD /usr/bin/sentrypeer -jar -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json
diff --git a/docker/sentrypeer/docker-compose.yml b/docker/sentrypeer/docker-compose.yml
index 10c328d3..9af74fd5 100644
--- a/docker/sentrypeer/docker-compose.yml
+++ b/docker/sentrypeer/docker-compose.yml
@@ -12,6 +12,12 @@ services:
     restart: always
 #    cpu_count: 1
 #    cpus: 0.25
+    environment:
+     - SENTRYPEER_WEB_GUI=1 
+     - SENTRYPEER_PEER_TO_PEER=1
+     - SENTRYPEER_BOOTSTRAP_NODE=bootstrap.sentrypeer.org
+     - SENTRYPEER_VERBOSE=1
+     - SENTRYPEER_DEBUG=1
     networks:
      - sentrypeer_local
     ports:
diff --git a/etc/compose/hive_sensor.yml b/etc/compose/hive_sensor.yml
index ad29b5ca..66d8f077 100644
--- a/etc/compose/hive_sensor.yml
+++ b/etc/compose/hive_sensor.yml
@@ -374,6 +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
     networks:
      - sentrypeer_local
     ports:
diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml
index 538f94c2..9e2332ce 100644
--- a/etc/compose/sensor.yml
+++ b/etc/compose/sensor.yml
@@ -374,6 +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
     networks:
      - sentrypeer_local
     ports:
diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml
index ced23963..63334f1d 100644
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@@ -374,6 +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
     networks:
      - sentrypeer_local
     ports: