diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e8d064830..1c1f7c8c4 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -52,7 +52,7 @@ jobs:
           holodeck_config: "test/e2e/infra/aws.yml"
 
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GOLANG_VERSION }}
 
diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml
index 09478dda5..8667e2c89 100644
--- a/.github/workflows/golang.yml
+++ b/.github/workflows/golang.yml
@@ -36,7 +36,7 @@ jobs:
         GOLANG_VERSION=$(./hack/golang-version.sh)
         echo "GOLANG_VERSION=${GOLANG_VERSION##GOLANG_VERSION := }" >> $GITHUB_ENV
     - name: Install Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ env.GOLANG_VERSION }}
     - name: Lint
@@ -88,7 +88,7 @@ jobs:
         GOLANG_VERSION=$(./hack/golang-version.sh)
         echo "GOLANG_VERSION=${GOLANG_VERSION##GOLANG_VERSION ?= }" >> $GITHUB_ENV
     - name: Install Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ env.GOLANG_VERSION }}
     - name: Setup JFrog CLI
@@ -125,7 +125,7 @@ jobs:
         GOLANG_VERSION=$(./hack/golang-version.sh)
         echo "GOLANG_VERSION=${GOLANG_VERSION##GOLANG_VERSION ?= }" >> $GITHUB_ENV
     - name: Install Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ env.GOLANG_VERSION }}
     - name: Setup JFrog CLI