diff --git a/.env b/.env
index d23446ce..65d8dec6 100644
--- a/.env
+++ b/.env
@@ -140,7 +140,7 @@ TPOT_VERSION=24.04
 #  never: Compose implementations SHOULD NOT pull the image from a registry and SHOULD rely on the platform cached image.
 #  missing: Compose implementations SHOULD pull the image only if it's not available in the platform cache.
 #  build: Compose implementations SHOULD build the image. Compose implementations SHOULD rebuild the image if already present.
-TPOT_PULL_POLICY=never
+TPOT_PULL_POLICY=always
 
 # T-Pot Data Path
 TPOT_DATA_PATH=./data
diff --git a/docker/_builder/docker-compose.yml b/docker/_builder/docker-compose.yml
index d4fbbddc..3f65495b 100644
--- a/docker/_builder/docker-compose.yml
+++ b/docker/_builder/docker-compose.yml
@@ -20,6 +20,17 @@ services:
 #### Tools
 ##################
 
+# T-Pot Init Service
+  tpotinit:
+    image: ${TPOT_DOCKER_REPO}/tpotinit:${TPOT_VERSION}
+    build:
+      tags:
+        - ${TPOT_GHCR_REPO}/tpotinit:${TPOT_VERSION}
+      context: ../tpotinit/
+      dockerfile: ./Dockerfile
+      platforms:
+        - ${TPOT_AMD64}
+        - ${TPOT_ARM64}
 
 #### ELK
 ## Logstash service