diff --git a/.github/workflows/gradle-no-native.yml b/.github/workflows/gradle-no-native.yml
index afa11a2..f6bca77 100644
--- a/.github/workflows/gradle-no-native.yml
+++ b/.github/workflows/gradle-no-native.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: Build and CodeQL Analysis
     runs-on: ubuntu-latest
 
     steps:
@@ -23,12 +23,20 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
 
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: java
+
       - name: Grant permissions
         run: chmod +x gradlew
 
       - name: Build
         run: ./gradlew assemble -x test
 
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+
   unit-tests:
     name: Unit Tests
     needs: build
@@ -83,23 +91,6 @@ jobs:
           path: |
             build/test-results/quarkusIntTest/*.xml
 
-  code-analysis:
-    name: CodeQL Analysis
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: java
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-
   event_file:
     name: "Event File"
     runs-on: ubuntu-latest