diff --git a/compose/customizer.py b/compose/customizer.py
index 8ec9ea17..e9487e7f 100644
--- a/compose/customizer.py
+++ b/compose/customizer.py
@@ -157,7 +157,6 @@ def main():
     remove_unused_networks(selected_services, services, networks)
 
     output_config = {
-        'version': '3.9',
         'networks': networks,
         'services': selected_services,
     }
diff --git a/compose/mac_win.yml b/compose/mac_win.yml
index 6c558bd5..57be938b 100644
--- a/compose/mac_win.yml
+++ b/compose/mac_win.yml
@@ -1,6 +1,4 @@
 # T-Pot: MAC_WIN
-version: '3.9'
-
 networks:
   tpotinit_local:
   adbhoney_local:
diff --git a/compose/mini.yml b/compose/mini.yml
index 7b08dbd9..7cad515f 100644
--- a/compose/mini.yml
+++ b/compose/mini.yml
@@ -1,6 +1,4 @@
 # T-Pot: MINI
-version: '3.9'
-
 networks:
   adbhoney_local:
   ciscoasa_local:
diff --git a/compose/mobile.yml b/compose/mobile.yml
index e968774c..2ba1809b 100644
--- a/compose/mobile.yml
+++ b/compose/mobile.yml
@@ -3,8 +3,6 @@
 #       T-Pot on a Raspberry Pi 4 (8GB of RAM).
 #       The standard docker compose file should work mostly fine (depending on traffic) if you do not enable a
 #       desktop environment such as LXDE and meet the minimum requirements of 8GB RAM.
-version: '3.9'
-
 networks:
   ciscoasa_local:
   citrixhoneypot_local:
diff --git a/compose/sensor.yml b/compose/sensor.yml
index e1aecb74..611d561d 100644
--- a/compose/sensor.yml
+++ b/compose/sensor.yml
@@ -1,6 +1,4 @@
 # T-Pot: SENSOR
-version: '3.9'
-
 networks:
   adbhoney_local:
   ciscoasa_local:
diff --git a/compose/standard.yml b/compose/standard.yml
index 960f3864..8d0422c9 100644
--- a/compose/standard.yml
+++ b/compose/standard.yml
@@ -1,6 +1,4 @@
 # T-Pot: STANDARD
-version: '3.9'
-
 networks:
   adbhoney_local:
   ciscoasa_local:
diff --git a/docker-compose.yml b/docker-compose.yml
index 960f3864..8d0422c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,4 @@
 # T-Pot: STANDARD
-version: '3.9'
-
 networks:
   adbhoney_local:
   ciscoasa_local:
diff --git a/docker/adbhoney/docker-compose.yml b/docker/adbhoney/docker-compose.yml
index d726e685..87cb0228 100644
--- a/docker/adbhoney/docker-compose.yml
+++ b/docker/adbhoney/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   adbhoney_local:
 
diff --git a/docker/builder.sh b/docker/builder.sh
index 9272f77d..43d90006 100755
--- a/docker/builder.sh
+++ b/docker/builder.sh
@@ -7,7 +7,8 @@ myPLATFORMS="linux/amd64,linux/arm64"
 myHUBORG_DOCKER="dtagdevsec"
 myHUBORG_GITHUB="ghcr.io/telekom-security"
 myTAG="24.04"
-myIMAGESBASE="tpotinit adbhoney ciscoasa citrixhoneypot conpot cowrie ddospot dicompot dionaea elasticpot endlessh ewsposter fatt glutton hellpot heralding honeypots honeytrap ipphoney log4pot mailoney medpot nginx p0f redishoneypot sentrypeer spiderfoot suricata wordpot"
+#myIMAGESBASE="tpotinit adbhoney ciscoasa citrixhoneypot conpot cowrie ddospot dicompot dionaea elasticpot endlessh ewsposter fatt glutton hellpot heralding honeypots honeytrap ipphoney log4pot mailoney medpot nginx p0f redishoneypot sentrypeer spiderfoot suricata wordpot"
+myIMAGESBASE="tpotinit adbhoney ciscoasa citrixhoneypot conpot cowrie ddospot dicompot dionaea elasticpot endlessh ewsposter fatt hellpot heralding honeypots honeytrap ipphoney log4pot mailoney medpot nginx p0f redishoneypot sentrypeer spiderfoot suricata wordpot"
 myIMAGESELK="elasticsearch kibana logstash map"
 myIMAGESTANNER="phpox redis snare tanner"
 myBUILDERLOG="builder.log"
diff --git a/docker/ciscoasa/docker-compose.yml b/docker/ciscoasa/docker-compose.yml
index 484bfb3e..37397a76 100644
--- a/docker/ciscoasa/docker-compose.yml
+++ b/docker/ciscoasa/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   ciscoasa_local:
 
diff --git a/docker/citrixhoneypot/docker-compose.yml b/docker/citrixhoneypot/docker-compose.yml
index 758ff5ab..490fbb06 100644
--- a/docker/citrixhoneypot/docker-compose.yml
+++ b/docker/citrixhoneypot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   citrixhoneypot_local:
 
diff --git a/docker/conpot/docker-compose.yml b/docker/conpot/docker-compose.yml
index 3a303b78..a97d27e0 100644
--- a/docker/conpot/docker-compose.yml
+++ b/docker/conpot/docker-compose.yml
@@ -1,6 +1,4 @@
 # CONPOT TEMPLATE=[default, IEC104, guardian_ast, ipmi, kamstrup_382, proxy]
-version: '2.3'
-
 networks:
   conpot_local_default:
   conpot_local_IEC104:
diff --git a/docker/cowrie/docker-compose.yml b/docker/cowrie/docker-compose.yml
index 50d3d1f1..2db5264f 100644
--- a/docker/cowrie/docker-compose.yml
+++ b/docker/cowrie/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   cowrie_local:
 
diff --git a/docker/ddospot/docker-compose.yml b/docker/ddospot/docker-compose.yml
index 7e0d33c4..c10744ea 100644
--- a/docker/ddospot/docker-compose.yml
+++ b/docker/ddospot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   ddospot_local:
 
diff --git a/docker/dicompot/docker-compose.yml b/docker/dicompot/docker-compose.yml
index fc21d7a1..3a886d05 100644
--- a/docker/dicompot/docker-compose.yml
+++ b/docker/dicompot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   dicompot_local:
 
diff --git a/docker/dionaea/docker-compose.yml b/docker/dionaea/docker-compose.yml
index 3f56048a..9b7bd23b 100644
--- a/docker/dionaea/docker-compose.yml
+++ b/docker/dionaea/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   dionaea_local:
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 772343ed..07de0c13 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,6 +1,4 @@
 # T-Pot Image Builder (use only for building docker images)
-version: '2.3'
-
 services:
 
 ##################
@@ -58,9 +56,9 @@ services:
     image: "dtagdevsec/endlessh:24.04"
 
 # Glutton service
-  glutton:
-    build: glutton/.
-    image: "dtagdevsec/glutton:24.04"
+#  glutton:
+#    build: glutton/.
+#    image: "dtagdevsec/glutton:24.04"
 
 # Hellpot service
   hellpot:
@@ -163,6 +161,11 @@ services:
 #### Tools
 ##################
 
+# T-Pot Init Service
+  tpotinit:
+    build: tpotinit/.
+    image: "dtagdevsec/tpotinit:24.04"
+
 #### ELK
 ## Elasticsearch service
   elasticsearch:
diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml
index 9291c15b..0070397c 100644
--- a/docker/elasticpot/docker-compose.yml
+++ b/docker/elasticpot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   elasticpot_local:
 
diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml
index bf5fba1d..6f3a2be8 100644
--- a/docker/elk/docker-compose.yml
+++ b/docker/elk/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # ELK services
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 942d20b1..d2736f1b 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV ES_VER=8.12.2
+ENV ES_VER=8.13.4
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/elk/elasticsearch/docker-compose.yml b/docker/elk/elasticsearch/docker-compose.yml
index 64916ca7..b4e92c28 100644
--- a/docker/elk/elasticsearch/docker-compose.yml
+++ b/docker/elk/elasticsearch/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # ELK services
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 1617761d..1f340029 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV KB_VER=8.12.2
+ENV KB_VER=8.13.4
 # Include dist
 COPY dist/ /root/dist/
 #
diff --git a/docker/elk/kibana/docker-compose.yml b/docker/elk/kibana/docker-compose.yml
index 7751d99a..d0ebcf34 100644
--- a/docker/elk/kibana/docker-compose.yml
+++ b/docker/elk/kibana/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 ## Kibana service
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 55d17f1f..76414779 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV LS_VER=8.12.2
+ENV LS_VER=8.13.4
 # Include dist
 COPY dist/ /root/dist/
 #
diff --git a/docker/elk/logstash/docker-compose.yml b/docker/elk/logstash/docker-compose.yml
index d73bb3fa..6f88e8da 100644
--- a/docker/elk/logstash/docker-compose.yml
+++ b/docker/elk/logstash/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 ## Logstash service
diff --git a/docker/elk/map/docker-compose.yml b/docker/elk/map/docker-compose.yml
index 475af039..7f2c7859 100644
--- a/docker/elk/map/docker-compose.yml
+++ b/docker/elk/map/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 #networks:
 #  map_local:
 
diff --git a/docker/endlessh/docker-compose.yml b/docker/endlessh/docker-compose.yml
index cbe01199..8b6ddbae 100644
--- a/docker/endlessh/docker-compose.yml
+++ b/docker/endlessh/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   endlessh_local:
 
diff --git a/docker/ewsposter/docker-compose.yml b/docker/ewsposter/docker-compose.yml
index 34bc9517..228e59a2 100644
--- a/docker/ewsposter/docker-compose.yml
+++ b/docker/ewsposter/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   ewsposter_local:
 
diff --git a/docker/fatt/docker-compose.yml b/docker/fatt/docker-compose.yml
index 29860f3f..271f7e50 100644
--- a/docker/fatt/docker-compose.yml
+++ b/docker/fatt/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # Fatt service
diff --git a/docker/glutton/docker-compose.yml b/docker/glutton/docker-compose.yml
index 1ac00b40..f6ec2880 100644
--- a/docker/glutton/docker-compose.yml
+++ b/docker/glutton/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # glutton service
diff --git a/docker/hellpot/docker-compose.yml b/docker/hellpot/docker-compose.yml
index 3c94eca7..bca3616d 100644
--- a/docker/hellpot/docker-compose.yml
+++ b/docker/hellpot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   hellpot_local:
 
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index cb59d41a..efa8e879 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-  
 networks:
   heralding_local:
 
diff --git a/docker/honeypots/docker-compose.yml b/docker/honeypots/docker-compose.yml
index df1ffd02..4ddba4ee 100644
--- a/docker/honeypots/docker-compose.yml
+++ b/docker/honeypots/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   honeypots_local:
 
diff --git a/docker/honeytrap/docker-compose.yml b/docker/honeytrap/docker-compose.yml
index 3a5f933a..cc2cc619 100644
--- a/docker/honeytrap/docker-compose.yml
+++ b/docker/honeytrap/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # Honeytrap service
diff --git a/docker/ipphoney/docker-compose.yml b/docker/ipphoney/docker-compose.yml
index 7a796aa4..5f37a236 100644
--- a/docker/ipphoney/docker-compose.yml
+++ b/docker/ipphoney/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   ipphoney_local:
 
diff --git a/docker/log4pot/docker-compose.yml b/docker/log4pot/docker-compose.yml
index 8df90135..439191ff 100644
--- a/docker/log4pot/docker-compose.yml
+++ b/docker/log4pot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   log4pot_local:
 
diff --git a/docker/mailoney/docker-compose.yml b/docker/mailoney/docker-compose.yml
index 00bc3008..450ba5e7 100644
--- a/docker/mailoney/docker-compose.yml
+++ b/docker/mailoney/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   mailoney_local:
 
diff --git a/docker/medpot/docker-compose.yml b/docker/medpot/docker-compose.yml
index e3ebc9e3..7151dff9 100644
--- a/docker/medpot/docker-compose.yml
+++ b/docker/medpot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   medpot_local:
 
diff --git a/docker/nginx/docker-compose.yml b/docker/nginx/docker-compose.yml
index fd3824e8..a5ededd0 100644
--- a/docker/nginx/docker-compose.yml
+++ b/docker/nginx/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # nginx service
diff --git a/docker/p0f/docker-compose.yml b/docker/p0f/docker-compose.yml
index 039aad5b..f3e3cd14 100644
--- a/docker/p0f/docker-compose.yml
+++ b/docker/p0f/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # P0f service
diff --git a/docker/redishoneypot/docker-compose.yml b/docker/redishoneypot/docker-compose.yml
index 347a84eb..f7c2c694 100644
--- a/docker/redishoneypot/docker-compose.yml
+++ b/docker/redishoneypot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   redishoneypot_local:
 
diff --git a/docker/sentrypeer/docker-compose.yml b/docker/sentrypeer/docker-compose.yml
index 4741324d..584a381c 100644
--- a/docker/sentrypeer/docker-compose.yml
+++ b/docker/sentrypeer/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   sentrypeer_local:
 
diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml
index 064e8169..8992221c 100644
--- a/docker/spiderfoot/docker-compose.yml
+++ b/docker/spiderfoot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   spiderfoot_local:
 
diff --git a/docker/suricata/docker-compose.yml b/docker/suricata/docker-compose.yml
index 7ac6c580..9c443639 100644
--- a/docker/suricata/docker-compose.yml
+++ b/docker/suricata/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 services:
 
 # Suricata service
diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml
index e3ed8799..76ceb60b 100644
--- a/docker/tanner/docker-compose.yml
+++ b/docker/tanner/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   tanner_local:
 
diff --git a/docker/tpotinit/docker-compose.yml b/docker/tpotinit/docker-compose.yml
index e5e43ab7..3481ad04 100644
--- a/docker/tpotinit/docker-compose.yml
+++ b/docker/tpotinit/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
 
 # T-Pot Init Service
diff --git a/docker/wordpot/docker-compose.yml b/docker/wordpot/docker-compose.yml
index 405f4a85..5cbc5908 100644
--- a/docker/wordpot/docker-compose.yml
+++ b/docker/wordpot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.3'
-
 networks:
   wordpot_local: