diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
index 402b5c2e4ff..cca3998f253 100644
--- a/.github/workflows/trivy.yaml
+++ b/.github/workflows/trivy.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.1
+          go-version: 1.23.5
         id: go
 
       - name: Checkout code
diff --git a/Makefile b/Makefile
index 033d1e161a7..b0805e6a817 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ include release-tools/build.make
 GIT_COMMIT := $(shell git rev-parse HEAD)
 REGISTRY ?= andyzhangx
 REGISTRY_NAME := $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
-IMAGE_VERSION ?= v1.17.0
+IMAGE_VERSION ?= v1.18.0
 VERSION ?= latest
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI