diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql.yml
similarity index 67%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql.yml
index 2309da57bdf4..8ea0baf57309 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql.yml
@@ -1,6 +1,15 @@
 name: codeql
 
 on:
+  push:
+    branches: 
+      - 'master' 
+      - '[0-9]+.[0-9]+' 
+    tags: 
+      - 'v*' 
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
   schedule:
     #        ┌───────────── minute (0 - 59)
     #        │ ┌───────────── hour (0 - 23)
@@ -15,7 +24,16 @@ on:
 
 jobs:
   codeql:
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 360
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    
+    container:
+      image: 'docker-cli-dev:latest'
+    
     steps:
       -
         name: Checkout
@@ -27,6 +45,11 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           git checkout HEAD^2
+      - 
+        name: Update Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
       -
         name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -38,3 +61,5 @@ jobs:
       -
         name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:go"