diff --git a/.github/workflows/dependabot-tidy.yaml b/.github/workflows/dependabot-tidy.yaml
index 678d19c9a..6ac302b9f 100644
--- a/.github/workflows/dependabot-tidy.yaml
+++ b/.github/workflows/dependabot-tidy.yaml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
       
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 'stable'
           check-latest: true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 544c223f0..5c2b719d5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
           token: ${{ steps.generate_token.outputs.token }}
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: stable
       - uses: actions/cache@v4
diff --git a/.github/workflows/reusable-go-ci.yaml b/.github/workflows/reusable-go-ci.yaml
index c0a46ee12..1b40bf049 100644
--- a/.github/workflows/reusable-go-ci.yaml
+++ b/.github/workflows/reusable-go-ci.yaml
@@ -89,7 +89,7 @@ jobs:
           fetch-depth: ${{ inputs.run_code_analysis && 0 || 1 }}
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # pin@5.5.0
         with:
           go-version-file: "${{ inputs.module }}/go.mod"
           cache: false # Using a separate cache step
@@ -134,7 +134,7 @@ jobs:
           fetch-depth: ${{ inputs.run_code_analysis && 0 || 1 }}
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # pin@5.5.0
         with:
           go-version-file: "${{ inputs.module }}/go.mod"
           cache: false # Using a separate cache step
@@ -214,7 +214,7 @@ jobs:
           fetch-depth: ${{ inputs.run_code_analysis && 0 || 1 }}
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # pin@5.5.0
         with:
           go-version-file: "${{ inputs.module }}/go.mod"
           cache: false
@@ -246,7 +246,7 @@ jobs:
           fetch-depth: 0 # CodeQL requires full history
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # pin@5.5.0
         with:
           go-version-file: "${{ inputs.module }}/go.mod"
           cache: false
@@ -285,7 +285,7 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # pinv3.30.3
         with:
-          category: "/language:go"
+          category: "/language:go/${{ inputs.module }}"
 
   build:
     name: "Build Image for ${{ inputs.module }}"
@@ -301,7 +301,7 @@ jobs:
           fetch-depth: ${{ inputs.run_code_analysis && 0 || 1 }}
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0
+        uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # pin@5.5.0
         with:
           go-version-file: "${{ inputs.module }}/go.mod"
           cache: false