diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
index 1242717ca..d3b160387 100644
--- a/.github/workflows/integration_test.yml
+++ b/.github/workflows/integration_test.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        go: ["1.23"]
+        go: ["1.24"]
         oci_bin: ["docker", "podman"]
     env:
       BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 562ebff40..c9b5a1456 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.23"]
+        go: ["1.24"]
         arch:
           - arch: amd64
             filename: linux-x86_64
@@ -59,7 +59,7 @@ jobs:
         run: make test
 
       - name: Archive Go code coverage results
-        if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.23' }}
+        if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.24' }}
         uses: actions/upload-artifact@v4
         with:
           name: coverage-go
diff --git a/Containerfile.bpfman-agent b/Containerfile.bpfman-agent
index 0149a683c..fec0c0421 100644
--- a/Containerfile.bpfman-agent
+++ b/Containerfile.bpfman-agent
@@ -1,7 +1,7 @@
 # Build the manager binary
 ARG BUILDPLATFORM
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS bpfman-agent-build
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS bpfman-agent-build
 
 # The following ARGs are set internally by docker/build-push-action in github actions
 ARG TARGETOS
@@ -25,7 +25,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod vendor -o bpfman-agent ./cmd/bpfman-agent/main.go
 
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS cri-tools-build
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS cri-tools-build
 # The following ARGs are set internally by docker/build-push-action in github actions
 ARG TARGETOS
 ARG TARGETARCH
@@ -37,12 +37,12 @@ RUN echo "TARGETOS=${TARGETOS}  TARGETARCH=${TARGETARCH}  BUILDPLATFORM=${BUILDP
 
 WORKDIR /usr/src/cri-tools
 ARG CRI_REPO_URL=https://github.com/kubernetes-sigs/cri-tools
-ARG CRI_REPO_TAG=v1.32.0
+ARG CRI_REPO_BRANCH=master
 
-RUN git clone --depth 1 --branch $CRI_REPO_TAG $CRI_REPO_URL .
+RUN git clone --depth 1 --branch $CRI_REPO_BRANCH $CRI_REPO_URL .
 
 # Build
-RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} VERSION=$CRI_REPO_TAG make
+RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} VERSION="latest" make
 RUN cp ./build/bin/${TARGETOS}/${TARGETARCH}/crictl .
 
 # Use the fedora minimal image to reduce the size of the final image but still
diff --git a/Containerfile.bpfman-operator b/Containerfile.bpfman-operator
index cdc3d20c0..33eb15beb 100644
--- a/Containerfile.bpfman-operator
+++ b/Containerfile.bpfman-operator
@@ -1,7 +1,7 @@
 # Build the manager binary
 ARG BUILDPLATFORM
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS bpfman-operator-build
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS bpfman-operator-build
 
 ARG BUILDPLATFORM
 
diff --git a/go.mod b/go.mod
index df1d2ccd6..591663f9d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/bpfman/bpfman-operator
 
-go 1.23.0
-
-toolchain go1.23.5
+go 1.24.0
 
 require (
 	github.com/bpfman/bpfman v0.5.7-0.20250305151919-a74c631c3643