diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index ff390a74a..90cef02ce 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -13,7 +13,7 @@ on:
     branches: [ "main" ]
 
 env:
-  GO_VERSION: ~1.20
+  GO_VERSION: ~1.21
   # Taken from https://github.com/kubernetes-sigs/kind/releases/tag/v0.18.0
   # The image here should be listed under 'Images built for this release' for the version of kind in go.mod
   KIND_NODE_IMAGE: "kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b547260f8..bcee9ebc0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,6 +37,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Install Go
+      uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
diff --git a/.github/workflows/prometheus-rules.yml b/.github/workflows/prometheus-rules.yml
index ca590c776..23561eef1 100644
--- a/.github/workflows/prometheus-rules.yml
+++ b/.github/workflows/prometheus-rules.yml
@@ -7,7 +7,7 @@ on:
     - observability/prometheus/rules/**/*.y*ml
 
 env:
-  GO_VERSION: ~1.20
+  GO_VERSION: ~1.21
 
 jobs:
   rules:
diff --git a/Dockerfile b/Dockerfile
index eb648a8d6..1b4a0df0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21 as builder
 
 WORKDIR /workspace
 
diff --git a/go.mod b/go.mod
index 50a358dd5..dce0d1b6f 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/go-logr/logr v1.4.1
 	github.com/go-stomp/stomp v2.1.4+incompatible
 	github.com/michaelklishin/rabbit-hole/v2 v2.15.0
-	github.com/mikefarah/yq/v4 v4.40.5
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
 	github.com/rabbitmq/amqp091-go v1.9.0
diff --git a/tools/tools.go b/tools/tools.go
index 1c3fe73bf..8ed94784c 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -5,7 +5,6 @@ package tools
 
 import (
 	_ "github.com/elastic/crd-ref-docs"
-	_ "github.com/mikefarah/yq/v4"
 	_ "github.com/onsi/ginkgo/v2/ginkgo"
 	_ "github.com/sclevine/yj"
 	_ "golang.org/x/vuln/cmd/govulncheck"