diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce6256d8..208baaa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.2.15 (2024-05-17)
+
+* Upgrade Go to 1.22.3
+* Fix #36
+
 ## 2.2.14 (2024-02-06)
 
 * Upgrade Go to 1.21.6
diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile
index 6c16a29e..6b4a0847 100644
--- a/cmd/fluent-bit/Dockerfile
+++ b/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 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 81a1c697..175c40a4 100644
--- a/cmd/logcli/Dockerfile
+++ b/cmd/logcli/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile
index b0e25787..f39b28fe 100644
--- a/cmd/migrate/Dockerfile
+++ b/cmd/migrate/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false migrate
diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
index f003500d..f3b9f6f4 100644
--- a/cmd/querytee/Dockerfile
+++ b/cmd/querytee/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross
index 92c52a30..6da837fa 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.21.6-alpine as goenv
+FROM golang:1.22.3-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/cmd/vali-canary/Dockerfile b/cmd/vali-canary/Dockerfile
index dd17cc0f..77183764 100644
--- a/cmd/vali-canary/Dockerfile
+++ b/cmd/vali-canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 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/vali-canary/Dockerfile.cross b/cmd/vali-canary/Dockerfile.cross
index 61d75fec..8c25b751 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.21.6-alpine as goenv
+FROM golang:1.22.3-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile
index 6967d593..859ac6c6 100644
--- a/cmd/vali/Dockerfile
+++ b/cmd/vali/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6 as build
+FROM golang:1.22.3 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/vali/Dockerfile.cross b/cmd/vali/Dockerfile.cross
index dbf8dbd8..ae4394cf 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.21.6-alpine as goenv
+FROM golang:1.22.3-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 
diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile
index 49ee702e..10541b60 100644
--- a/cmd/valitail/Dockerfile
+++ b/cmd/valitail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6-bullseye as build
+FROM golang:1.22.3-bullseye 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 6aa75e50..a5b45c64 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.21.6-alpine as goenv
+FROM golang:1.22.3-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/vali-build-image/Dockerfile b/vali-build-image/Dockerfile
index 87a370f3..380b67d7 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.21.6 as faillint
+FROM docker.io/library/golang:1.22.3 as faillint
 RUN go install github.com/fatih/faillint@v1.11.0
 
-FROM docker.io/library/golang:1.21.6-bullseye
+FROM docker.io/library/golang:1.22.3-bullseye
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg \