diff --git a/docker/adbhoney/Dockerfile b/docker/adbhoney/Dockerfile
index e6a0e0c3..b49e344b 100644
--- a/docker/adbhoney/Dockerfile
+++ b/docker/adbhoney/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN	apk --no-cache -U add \
+RUN	apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		git \
 		procps \
@@ -17,12 +18,14 @@ RUN	apk --no-cache -U add \
 # Install adbhoney from git
     git clone https://github.com/t3chn0m4g3/ADBHoney /opt/adbhoney && \
     cd /opt/adbhoney && \
+	git checkout 42a73cd8a82ddd4d137de70ac37b1a8b2e3e0119 && \
     cp /root/dist/adbhoney.cfg /opt/adbhoney && \
     sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
     sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
     pyinstaller adbhoney.spec
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/adbhoney/dist/adbhoney/ /opt/adbhoney/
 #
 # Set workdir and start adbhoney
diff --git a/docker/adbhoney/Dockerfile.old b/docker/adbhoney/Dockerfile.old
deleted file mode 100644
index 8e5ec90a..00000000
--- a/docker/adbhoney/Dockerfile.old
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM alpine:3.20
-#
-# Include dist
-COPY dist/ /root/dist/
-#
-# Install packages
-RUN	apk --no-cache -U add \
-		git \
-		procps \
-		py3-psutil \
-		py3-requests \
-		python3 && \
-#
-# Install adbhoney from git
-    git clone https://github.com/t3chn0m4g3/ADBHoney /opt/adbhoney && \
-#   cd /opt/adbhoney && \
-#    git checkout 2417a7a982f4fd527b3a048048df9a23178767ad && \
-#   git checkout 42afd98611724ca3d694a48b694c957e8d953db4 && \
-    cp /root/dist/adbhoney.cfg /opt/adbhoney && \
-    cp /root/dist/cpu_check.py / && \
-    sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
-    sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 adbhoney && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 adbhoney && \
-    chown -R adbhoney:adbhoney /opt/adbhoney && \
-#
-# Clean up
-    apk del --purge git && \
-    rm -rf /root/* /opt/adbhoney/.git /var/cache/apk/*
-#
-# Set workdir and start adbhoney
-STOPSIGNAL SIGINT
-# Adbhoney sometimes hangs at 100% CPU usage, if detected container will become unhealthy and restarted by tpotinit
-HEALTHCHECK --interval=5m --timeout=30s --retries=3 CMD python3 /cpu_check.py $(pgrep -of run.py) 99
-USER adbhoney:adbhoney
-WORKDIR /opt/adbhoney/
-CMD ["/usr/bin/python3", "run.py"]
diff --git a/docker/beelzebub/Dockerfile b/docker/beelzebub/Dockerfile
index f8df3281..0dd01398 100644
--- a/docker/beelzebub/Dockerfile
+++ b/docker/beelzebub/Dockerfile
@@ -10,7 +10,9 @@ RUN apk -U add git
 WORKDIR /root
 #
 # Build beelzebub
-RUN git clone https://github.com/t3chn0m4g3/beelzebub
+RUN git clone https://github.com/t3chn0m4g3/beelzebub && \
+    cd beelzebub && \
+    git checkout 17a0854b8d9d1e41cf5435b5dc85354bbfb9093c
 WORKDIR /root/beelzebub
 RUN go mod download
 RUN go build -o main .
diff --git a/docker/beelzebub/Dockerfile.old b/docker/beelzebub/Dockerfile.old
deleted file mode 100644
index a8f452c3..00000000
--- a/docker/beelzebub/Dockerfile.old
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM golang:1.20-alpine AS builder
-#
-ENV GO111MODULE=on \
-    CGO_ENABLED=0 \
-    GOOS=linux
-#
-# Install packages
-RUN apk -U add git
-#
-WORKDIR /root
-#
-# Build beelzebub
-RUN git clone https://github.com/t3chn0m4g3/beelzebub
-WORKDIR /root/beelzebub
-RUN go mod download
-RUN go build -o main .
-#
-FROM alpine:3.20
-#
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /root/beelzebub/main /opt/beelzebub/
-COPY --from=builder /root/beelzebub/configurations /opt/beelzebub/configurations
-#
-# Setup user, groups and configs
-RUN <<EOF
-sed -i "s#logsPath: ./log#logsPath: ./configurations/log/beelzebub.json#g" /opt/beelzebub/configurations/beelzebub.yaml
-sed -i 's/passwordRegex: "^(root|qwerty|Smoker666|123456|jenkins|minecraft|sinus|alex|postgres|Ly123456)$"/passwordRegex: ".*"/g' /opt/beelzebub/configurations/services/ssh-22.yaml
-addgroup -g 2000 beelzebub
-adduser -S -s /bin/ash -u 2000 -D -g 2000 beelzebub
-mkdir -p /beelzebub/configurations/key \
-         /beelzebub/configurations/log
-chown beelzebub:beelzebub -R /opt/beelzebub/configurations
-chmod 0770 -R /opt/beelzebub/configurations
-EOF
-#
-# Start beelzebub
-WORKDIR /opt/beelzebub
-USER beelzebub:beelzebub
-CMD ["./main"]
diff --git a/docker/ciscoasa/Dockerfile b/docker/ciscoasa/Dockerfile
index 470a1e05..496cd47f 100644
--- a/docker/ciscoasa/Dockerfile
+++ b/docker/ciscoasa/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.20 AS builder
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		git \
 		libffi \
@@ -17,6 +18,7 @@ RUN apk --no-cache -U add \
     cd /opt/ && \
     git clone https://github.com/t3chn0m4g3/ciscoasa_honeypot && \
     cd ciscoasa_honeypot && \
+	git checkout 4bd2795cfa14320a87c00b7159fa3b7d6a8ba254 && \
     sed -i "s/git+git/git+https/g" requirements.txt && \
     pip3 install --break-system-packages pyinstaller && \
     pip3 install --break-system-packages --no-cache-dir -r requirements.txt
@@ -24,6 +26,7 @@ WORKDIR /opt/ciscoasa_honeypot
 RUN pyinstaller asa_server.py --add-data "./asa:./asa"
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/ciscoasa_honeypot/dist/ /opt/
 #
 # Start ciscoasa
diff --git a/docker/citrixhoneypot/Dockerfile b/docker/citrixhoneypot/Dockerfile
index eea75619..3c855048 100644
--- a/docker/citrixhoneypot/Dockerfile
+++ b/docker/citrixhoneypot/Dockerfile
@@ -1,13 +1,13 @@
 FROM alpine:3.20 AS builder
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
         build-base \
 		git \
 		openssl \
 		py3-pip \
 		python3 && \
-#
     pip3 install --break-system-packages --no-cache-dir \
         pyinstaller \
         python-json-logger
@@ -15,7 +15,7 @@ RUN apk --no-cache -U add \
 # Install CitrixHoneypot from GitHub
 RUN git clone https://github.com/t3chn0m4g3/CitrixHoneypot /opt/citrixhoneypot && \
     cd /opt/citrixhoneypot && \
-#
+    git checkout dee32447033a0296d053e8f881bf190f9dd7ad44 && \
     mkdir -p /opt/citrixhoneypot/logs /opt/citrixhoneypot/ssl && \
     openssl req \
           -nodes \
@@ -31,6 +31,7 @@ WORKDIR /opt/citrixhoneypot
 RUN pyinstaller CitrixHoneypot.py
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/citrixhoneypot/dist/CitrixHoneypot/ /opt/citrixhoneypot
 COPY --from=builder /opt/citrixhoneypot/ssl /opt/citrixhoneypot/ssl
 COPY --from=builder /opt/citrixhoneypot/responses/ /opt/citrixhoneypot/responses
diff --git a/docker/conpot/Dockerfile b/docker/conpot/Dockerfile
index 87f02044..37ed51e4 100644
--- a/docker/conpot/Dockerfile
+++ b/docker/conpot/Dockerfile
@@ -4,7 +4,9 @@ FROM alpine:3.19
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add build-base \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
+            build-base \
 			cython \
 			file \
 			git \
@@ -44,12 +46,12 @@ RUN apk --no-cache -U add build-base \
 # Setup ConPot
     git clone https://github.com/t3chn0m4g3/cpppo /opt/cpppo && \
     cd /opt/cpppo && \
+    git checkout 350d5187a941e7359c53087dcb1f0e41ece5682c && \
     pip3 install --break-system-packages --no-cache-dir --upgrade pip && \
     pip3 install --break-system-packages --no-cache-dir . && \
     git clone https://github.com/mushorg/conpot /opt/conpot && \
     cd /opt/conpot/ && \
 	git checkout 26c67d11b08a855a28e87abd186d959741f46c7f && \
-    # git checkout b3740505fd26d82473c0d7be405b372fa0f82575 && \
     # Change template default ports if <1024
     sed -i 's/port="2121"/port="21"/' /opt/conpot/conpot/templates/default/ftp/ftp.xml && \
     sed -i 's/port="8800"/port="80"/' /opt/conpot/conpot/templates/default/http/http.xml && \
@@ -90,7 +92,9 @@ RUN apk --no-cache -U add build-base \
             wget && \
     rm -rf /root/* \
            /tmp/* \
-           /var/cache/apk/*
+           /var/cache/apk/* \
+           /opt/cpppo/.git \
+           /opt/conpot/.git
 #
 # Start conpot
 STOPSIGNAL SIGINT
diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile
index 5eea8960..9565f512 100644
--- a/docker/cowrie/Dockerfile
+++ b/docker/cowrie/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		bash \
 		build-base \
 		git \
diff --git a/docker/ddospot/Dockerfile b/docker/ddospot/Dockerfile
index 701d6165..d3935008 100644
--- a/docker/ddospot/Dockerfile
+++ b/docker/ddospot/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		build-base \
 		git \
 		py3-colorama \
@@ -22,6 +23,7 @@ RUN apk --no-cache -U add \
     cd /opt/ && \
     git clone https://github.com/t3chn0m4g3/ddospot && \
     cd ddospot && \
+    git checkout 66b94f3cf56c66e2e26b55feff9e65493cfadf3c && \
     cp /root/dist/requirements.txt . && \
     pip3 install --break-system-packages -r ddospot/requirements.txt && \
     pip3 install --break-system-packages pyinstaller
@@ -51,6 +53,7 @@ RUN pyinstaller ddospot.py \
        --hidden-import OpenSSL.SSL
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/ddospot/ddospot/dist/ddospot/ /opt/ddospot/ddospot
 COPY --from=builder /opt/ddospot/ddospot/global.conf /opt/ddospot/ddospot/
 COPY --from=builder /opt/ddospot/ddospot/pots /opt/ddospot/ddospot/pots
diff --git a/docker/ddospot/Dockerfile.old b/docker/ddospot/Dockerfile.old
deleted file mode 100644
index b81d2982..00000000
--- a/docker/ddospot/Dockerfile.old
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM alpine:3.20
-#
-# Include dist
-COPY dist/ /root/dist/
-#
-# Install packages
-RUN apk --no-cache -U add \
-		build-base \
-		git \
-		libcap \
-		py3-colorama \
-		py3-greenlet \
-		py3-pip \
-		py3-schedule \
-		py3-sqlalchemy \
-		py3-twisted \
-		py3-wheel \
-		python3 \
-		python3-dev && \
-#	     
-# Install ddospot from GitHub and setup
-    mkdir -p /opt && \
-    cd /opt/ && \
-    git clone https://github.com/t3chn0m4g3/ddospot -b test && \
-    cd ddospot && \
-    cp /root/dist/requirements.txt . && \
-    pip3 install --break-system-packages -r ddospot/requirements.txt && \
-    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 ddospot && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 ddospot && \
-    chown ddospot:ddospot -R /opt/ddospot && \
-#
-# Clean up
-    apk del --purge build-base \
-			git \
-			python3-dev && \
-    rm -rf /root/* \
-            /opt/ddospot/.git \
-            /var/cache/apk/*
-#
-# Start ddospot
-STOPSIGNAL SIGINT
-USER ddospot:ddospot
-WORKDIR /opt/ddospot/ddospot/
-CMD ["/usr/bin/python3","ddospot.py", "-n"]
diff --git a/docker/dionaea/Dockerfile b/docker/dionaea/Dockerfile
index 4f6bdf0c..0d69851a 100644
--- a/docker/dionaea/Dockerfile
+++ b/docker/dionaea/Dockerfile
@@ -4,7 +4,6 @@ ENV DEBIAN_FRONTEND noninteractive
 # Include dist
 COPY dist/ /root/dist/
 #
-
 # Determine arch, get and install packages
 RUN ARCH=$(arch) && \
       if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; fi && \
@@ -13,10 +12,11 @@ RUN ARCH=$(arch) && \
     cd /root/dist/ && \
 # Setup apt
     apt-get update -y && \
+    apt-get upgrade -y && \
     apt-get install wget -y && \
     wget http://ftp.us.debian.org/debian/pool/main/libe/libemu/libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
          http://ftp.us.debian.org/debian/pool/main/libe/libemu/libemu-dev_0.2.0+git20120122-1.2+b1_$ARCH.deb && \
-    apt install ./libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
+    apt-get install ./libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
                 ./libemu-dev_0.2.0+git20120122-1.2+b1_$ARCH.deb -y && \
     apt-get install -y --no-install-recommends \
 		build-essential \
diff --git a/docker/elasticpot/Dockerfile b/docker/elasticpot/Dockerfile
index 63504468..6adfab44 100644
--- a/docker/elasticpot/Dockerfile
+++ b/docker/elasticpot/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		ca-certificates \
 		git \
@@ -42,6 +43,7 @@ RUN pyinstaller elasticpot.py \
 		--hidden-import output_plugins.jsonlog
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/elasticpot/dist/ /opt/
 COPY --from=builder /opt/elasticpot/responses/ /opt/elasticpot/responses/
 COPY --from=builder /root/dist/honeypot.cfg /opt/elasticpot/etc/
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 985d3761..7a454352 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -7,6 +7,7 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN	apt-get update -y && \
+    apt-get upgrade -y && \
     apt-get install -y \
 			adduser \
             aria2 \
@@ -18,16 +19,12 @@ RUN	apt-get update -y && \
       if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; fi && \
     echo "$ARCH" && \
     cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/config /etc/elasticsearch && \
+    mkdir -p /usr/share/elasticsearch/config \
+             /etc/elasticsearch && \
     cp elasticsearch.yml /etc/elasticsearch/ && \
     aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VER-$ES_ARCH.deb && \
     dpkg --force-confold -i elasticsearch-$ES_VER-$ES_ARCH.deb && \
 #
-# Add and move files
-#    rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
-#    mkdir -p /usr/share/elasticsearch/config && \
-#    cp elasticsearch.yml /etc/elasticsearch/ && \
-#
 # Setup user, groups and configs
     groupmod -g 2000 elasticsearch && \
     usermod -u 2000 elasticsearch && \
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 1d6d6f02..0d21d2de 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -5,7 +5,8 @@ ENV KB_VER=8.14.2
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
             aria2 \
             curl \
             gcompat && \
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 2c611e7a..225bf1a9 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -7,6 +7,7 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN apt-get update -y && \
+    apt-get upgrade -y && \
     apt-get install -y \
     		 adduser \
              aria2 \
@@ -27,7 +28,6 @@ RUN apt-get update -y && \
     cd /root/dist/ && \
     aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-$LS_VER-$LS_ARCH.deb && \
     dpkg -i logstash-$LS_VER-$LS_ARCH.deb && \
-#    /usr/share/logstash/bin/logstash-plugin install logstash-output-gelf logstash-output-syslog && \
 #
 # Add and move files
     cd /root/dist/ && \
diff --git a/docker/elk/map/Dockerfile b/docker/elk/map/Dockerfile
index ac279fd5..9bc88a85 100644
--- a/docker/elk/map/Dockerfile
+++ b/docker/elk/map/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.20
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -28,7 +29,8 @@ RUN apk --no-cache -U add \
     apk del --purge build-base \
 		git \
 		python3-dev && \
-    rm -rf /root/* /var/cache/apk/* /opt/t-pot-attack-map/.git
+    rm -rf /root/* /var/cache/apk/* \
+           /opt/t-pot-attack-map/.git
 #
 # Start T-Pot-Attack-Map
 ENV TZ=UTC
diff --git a/docker/endlessh/Dockerfile b/docker/endlessh/Dockerfile
index 1ce956e6..0b66a42b 100644
--- a/docker/endlessh/Dockerfile
+++ b/docker/endlessh/Dockerfile
@@ -17,7 +17,7 @@ RUN apk -U add --no-cache \
     mv /opt/endlessh/endlessh /root/dist
 #
 FROM alpine:3.20
-#
+RUN apk --no-cache -U upgrade
 COPY --from=builder /root/dist/* /opt/endlessh/
 #
 STOPSIGNAL SIGINT
diff --git a/docker/ewsposter/Dockerfile b/docker/ewsposter/Dockerfile
index 9df14a2f..2f3627ed 100644
--- a/docker/ewsposter/Dockerfile
+++ b/docker/ewsposter/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.19
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		git \
 		libffi-dev \
@@ -23,7 +24,12 @@ RUN apk --no-cache -U add \
 		py3-setuptools \
 		py3-wheel && \
 	pip3 install --break-system-packages --upgrade pip && \
-	pip3 install --break-system-packages --no-cache-dir configparser hpfeeds3 influxdb influxdb-client xmljson && \
+	pip3 install --break-system-packages --no-cache-dir \
+			configparser \
+			hpfeeds3 \
+			influxdb \
+			influxdb-client \
+			xmljson && \
 #
 # Setup ewsposter
     git clone https://github.com/telekom-security/ewsposter -b v1.25.0 /opt/ewsposter && \
diff --git a/docker/fatt/Dockerfile b/docker/fatt/Dockerfile
index 09fc15be..4f151793 100644
--- a/docker/fatt/Dockerfile
+++ b/docker/fatt/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.20
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		git \
 		libcap \
 		py3-libxml2 \
@@ -22,7 +23,7 @@ RUN apk --no-cache -U add \
     cd fatt && \
     git checkout c29e553514281e50781f86932b82337a5ada5640 && \
     mkdir -p log && \
-    pip3 install --break-system-packages pyshark && \
+    pip3 install --no-cache-dir --break-system-packages pyshark && \
 #
 # Setup configs
     chgrp fatt /usr/bin/dumpcap && \
diff --git a/docker/fatt/docker-compose.yml b/docker/fatt/docker-compose.yml
index 271f7e50..a56b626b 100644
--- a/docker/fatt/docker-compose.yml
+++ b/docker/fatt/docker-compose.yml
@@ -4,6 +4,8 @@ services:
   fatt:
     build: .
     container_name: fatt
+    stdin_open: true
+    tty: true
     restart: always
 #    cpu_count: 1
 #    cpus: 0.75
diff --git a/docker/galah/Dockerfile b/docker/galah/Dockerfile
index c1ba4a88..bf59861a 100644
--- a/docker/galah/Dockerfile
+++ b/docker/galah/Dockerfile
@@ -1,9 +1,12 @@
 FROM golang:1.23-alpine AS builder
 RUN <<EOF
-apk -U add build-base git
+apk --no-cache -U upgrade
+apk --no-cache -U add build-base git
 mkdir -p /opt
 cd /opt
 git clone https://github.com/t3chn0m4g3/galah
+cd galah
+git checkout d4739ec5abaed83c5367716a77908be548d3d003
 EOF
 WORKDIR /opt/galah
 ENV CGO_ENABLED=1
@@ -13,6 +16,7 @@ go build -o galah ./cmd/galah
 EOF
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/galah/ /opt/galah/
 #
 # Start galah
diff --git a/docker/glutton/Dockerfile b/docker/glutton/Dockerfile
index f8c905ca..b8a5661d 100644
--- a/docker/glutton/Dockerfile
+++ b/docker/glutton/Dockerfile
@@ -4,7 +4,8 @@ FROM golang:1.23-alpine AS builder
 COPY dist/ /root/dist/
 # 
 # Setup apk
-RUN apk -U --no-cache add \
+RUN apk --no-cache -U upgrade && \
+	apk -U --no-cache add \
 		make \
   		git \
 		g++ \