diff --git a/compose/mac_win.yml b/compose/mac_win.yml
index 00164153..dc954039 100644
--- a/compose/mac_win.yml
+++ b/compose/mac_win.yml
@@ -327,16 +327,12 @@ services:
 # Mailoney service
   mailoney:
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
     depends_on:
       tpotinit:
         condition: service_healthy
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
     networks:
      - mailoney_local
     ports:
diff --git a/compose/mobile.yml b/compose/mobile.yml
index 3768c929..78c79482 100644
--- a/compose/mobile.yml
+++ b/compose/mobile.yml
@@ -393,16 +393,12 @@ services:
 # Mailoney service
   mailoney:
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
     depends_on:
       logstash:
         condition: service_healthy
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
     networks:
      - mailoney_local
     ports:
diff --git a/compose/sensor.yml b/compose/sensor.yml
index f881821f..34577a18 100644
--- a/compose/sensor.yml
+++ b/compose/sensor.yml
@@ -433,16 +433,12 @@ services:
 # Mailoney service
   mailoney:
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
     depends_on:
       tpotinit:
         condition: service_healthy
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
     networks:
      - mailoney_local
     ports:
diff --git a/compose/standard.yml b/compose/standard.yml
index e4c36dc1..86192a1a 100644
--- a/compose/standard.yml
+++ b/compose/standard.yml
@@ -435,16 +435,12 @@ services:
 # Mailoney service
   mailoney:
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
     depends_on:
       tpotinit:
         condition: service_healthy
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
     networks:
      - mailoney_local
     ports:
diff --git a/compose/tpot_services.yml b/compose/tpot_services.yml
index f3b52b78..f1e725c0 100644
--- a/compose/tpot_services.yml
+++ b/compose/tpot_services.yml
@@ -666,16 +666,12 @@ services:
 # Mailoney service
   mailoney:
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
     depends_on:
       tpotinit:
         condition: service_healthy
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
     networks:
      - mailoney_local
     ports:
diff --git a/docker/honeypots/Dockerfile b/docker/honeypots/Dockerfile
index 20fdde23..2e8c6d04 100644
--- a/docker/honeypots/Dockerfile
+++ b/docker/honeypots/Dockerfile
@@ -45,8 +45,9 @@ RUN apk --no-cache -U add \
     mkdir -p /opt \
              /var/log/honeypots && \
     cd /opt/ && \
-    git clone https://github.com/t3chn0m4g3/honeypots && \
+    git clone https://github.com/qeeqbox/honeypots && \
     cd honeypots && \
+	git checkout 238c6732d28b36ab88f2008361bafc8aef054755 && \
     pip3 install --break-system-packages --no-cache-dir . && \
     setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
 #
diff --git a/docker/log4pot/Dockerfile b/docker/log4pot/Dockerfile
index 3b60f37f..43adf0ba 100644
--- a/docker/log4pot/Dockerfile
+++ b/docker/log4pot/Dockerfile
@@ -26,10 +26,10 @@ RUN apt-get update -y && \
 # Install log4pot from GitHub and setup
     mkdir -p /opt /var/log/log4pot && \
     cd /opt/ && \
-    #git clone https://github.com/thomaspatzke/Log4Pot && \
-	git clone https://github.com/t3chn0m4g3/Log4Pot && \
+    git clone https://github.com/thomaspatzke/Log4Pot && \
+	#git clone https://github.com/t3chn0m4g3/Log4Pot && \
     cd Log4Pot && \
-    git checkout 31115d1ed0e78560672c597cb1e09d0f7ee5ab19 && \
+    git checkout 5002b1fe0f82359ef32dbc3a899e8a701dc3256e && \
     sed -i 's#"type": logtype,#"reason": logtype,#g' log4pot-server.py && \
 	# rm poetry.lock && \
 	poetry --no-cache install && \
diff --git a/docker/mailoney/Dockerfile b/docker/mailoney/Dockerfile
index 815d3d72..d6e5fd6d 100644
--- a/docker/mailoney/Dockerfile
+++ b/docker/mailoney/Dockerfile
@@ -1,16 +1,17 @@
+# For Mailoney to work we need to keep Alpine 3.19 for now
 FROM alpine:3.19
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		git \
 		libcap \
-		py3-pip \
 		python3 && \
 #
 # Install mailoney from git
     git clone https://github.com/t3chn0m4g3/mailoney /opt/mailoney && \
     cd /opt/mailoney && \
-    pip3 install --break-system-packages -r requirements.txt && \
+    git checkout 06e54bd410e0044d26d8462321f1b2811318db0b && \
 #
 # Setup user, groups and configs
     addgroup -g 2000 mailoney && \
@@ -26,4 +27,4 @@ RUN apk --no-cache -U add \
 STOPSIGNAL SIGINT
 USER mailoney:mailoney
 WORKDIR /opt/mailoney/
-CMD ["/usr/bin/python","mailoney.py","-i","0.0.0.0","-p","25","-s","mailrelay.local","-t","schizo_open_relay"]
+CMD ["/usr/bin/python","mailoney.py","-i","0.0.0.0","-p","25","-t","schizo_open_relay"]
\ No newline at end of file
diff --git a/docker/mailoney/docker-compose.yml b/docker/mailoney/docker-compose.yml
index 450ba5e7..51b0462d 100644
--- a/docker/mailoney/docker-compose.yml
+++ b/docker/mailoney/docker-compose.yml
@@ -7,13 +7,9 @@ services:
   mailoney:
     build: .
     container_name: mailoney
+    stdin_open: true
+    tty: true
     restart: always
-    environment:
-     - HPFEEDS_SERVER=
-     - HPFEEDS_IDENT=user
-     - HPFEEDS_SECRET=pass
-     - HPFEEDS_PORT=20000
-     - HPFEEDS_CHANNELPREFIX=prefix
 #    cpu_count: 1
 #    cpus: 0.25
     networks: