diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f9bd32..831aa08e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.2.17 (2024-07-04)
+
+* Upgrade Go to 1.22.5
+* Upgrade Alpine to 3.20.1
+
 ## 2.2.16 (2024-06-13)
 
 * Upgrade Go to 1.22.4
diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile
index ce31ff41..2494a83d 100644
--- a/cmd/docker-driver/Dockerfile
+++ b/cmd/docker-driver/Dockerfile
@@ -9,7 +9,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false cmd/docker-driver/docker-driver
 
-FROM alpine:3.19
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates tzdata
 COPY --from=build /src/vali/cmd/docker-driver/docker-driver /bin/docker-driver
 WORKDIR /bin/
diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile
index 9367fc14..c7f676ff 100644
--- a/cmd/fluent-bit/Dockerfile
+++ b/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin
diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile
index 49b50f34..cfd576e4 100644
--- a/cmd/logcli/Dockerfile
+++ b/cmd/logcli/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false logcli
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile
index 09b2430d..3f32cf0e 100644
--- a/cmd/migrate/Dockerfile
+++ b/cmd/migrate/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false migrate
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/migrate/migrate /usr/bin/migrate
 #ENTRYPOINT [ "/usr/bin/migrate" ]
diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
index 741b469a..a956c470 100644
--- a/cmd/querytee/Dockerfile
+++ b/cmd/querytee/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false vali-querytee
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/querytee/vali-querytee /usr/bin/querytee
 ENTRYPOINT [ "/usr/bin/querytee" ]
diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross
index 6da837fa..c0f966e4 100644
--- a/cmd/querytee/Dockerfile.cross
+++ b/cmd/querytee/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.9.1
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.22.3-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-querytee
 
-FROM alpine:3.19
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/querytee/querytee /usr/bin/querytee
 ENTRYPOINT [ "/usr/bin/querytee" ]
diff --git a/cmd/vali-canary/Dockerfile b/cmd/vali-canary/Dockerfile
index b7df394b..6c890e18 100644
--- a/cmd/vali-canary/Dockerfile
+++ b/cmd/vali-canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
@@ -6,7 +6,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali-canary
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
 ENTRYPOINT [ "/usr/bin/vali-canary" ]
diff --git a/cmd/vali-canary/Dockerfile.cross b/cmd/vali-canary/Dockerfile.cross
index 8c25b751..214c9263 100644
--- a/cmd/vali-canary/Dockerfile.cross
+++ b/cmd/vali-canary/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.22.3-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-canary
 
-FROM alpine:3.19
+FROM alpine:3.20.1
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
 ENTRYPOINT [ "/usr/bin/vali-canary" ]
diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile
index f0615b6d..1ed85fa1 100644
--- a/cmd/vali/Dockerfile
+++ b/cmd/vali/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4 as build
+FROM golang:1.22.5 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
@@ -6,7 +6,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 
 RUN apk add --no-cache ca-certificates libcap
 
diff --git a/cmd/vali/Dockerfile.cross b/cmd/vali/Dockerfile.cross
index ae4394cf..4c08db8c 100644
--- a/cmd/vali/Dockerfile.cross
+++ b/cmd/vali/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/vali -f cmd/vali/Dockerfile .
-FROM golang:1.22.3-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali
 
-FROM alpine:3.19
+FROM alpine:3.20.1
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/cmd/vali/Dockerfile.debug b/cmd/vali/Dockerfile.debug
index c8f861ed..5c0ba911 100644
--- a/cmd/vali/Dockerfile.debug
+++ b/cmd/vali/Dockerfile.debug
@@ -8,7 +8,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false vali-debug
 
-FROM       alpine:3.19
+FROM       alpine:3.20.1
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /src/vali/cmd/vali/vali-debug /usr/bin/vali-debug
 COPY       --from=build /go/bin/dlv /usr/bin/dlv
diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile
index 0a415e26..b3700c59 100644
--- a/cmd/valitail/Dockerfile
+++ b/cmd/valitail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4-bookworm as build
+FROM golang:1.22.5-bookworm as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
diff --git a/cmd/valitail/Dockerfile.cross b/cmd/valitail/Dockerfile.cross
index a5b45c64..5b92986b 100644
--- a/cmd/valitail/Dockerfile.cross
+++ b/cmd/valitail/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.22.3-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/cmd/valitail/Dockerfile.debug b/cmd/valitail/Dockerfile.debug
index 99989b99..1343e8f9 100644
--- a/cmd/valitail/Dockerfile.debug
+++ b/cmd/valitail/Dockerfile.debug
@@ -9,7 +9,7 @@ WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false valitail-debug
 
 
-FROM       alpine:3.19
+FROM       alpine:3.20.1
 RUN        apk add --update --no-cache ca-certificates tzdata
 COPY       --from=build /src/vali/cmd/valitail/valitail-debug /usr/bin/valitail-debug
 COPY       --from=build /go/bin/dlv /usr/bin/dlv
diff --git a/vali-build-image/Dockerfile b/vali-build-image/Dockerfile
index dfed6241..d019db4b 100644
--- a/vali-build-image/Dockerfile
+++ b/vali-build-image/Dockerfile
@@ -20,10 +20,10 @@ RUN apk add --no-cache docker-cli
 # Error:
 #	github.com/fatih/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025
 #   (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
-FROM docker.io/library/golang:1.22.4 as faillint
+FROM docker.io/library/golang:1.22.5 as faillint
 RUN go install github.com/fatih/faillint@v1.11.0
 
-FROM docker.io/library/golang:1.22.4-bookworm
+FROM docker.io/library/golang:1.22.5-bookworm
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg \