diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f28a2f0..9ae90d0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,11 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Set Java 21 as default
-        run: |
-          export JAVA_HOME=${JAVA_HOME_21_X64}
-          export PATH=$JAVA_HOME/bin:$PATH
+        uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "graalvm"
+          java-version: "21"
       - name: Cache Gradle Packages
         uses: actions/cache@v4
         with:
@@ -29,51 +30,13 @@ jobs:
         env:
           GRADLE_OPTS: "-Dorg.gradle.daemon=false"
 
-  pmd:
-    name: PMD Analysis
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Set Java 21 as default
-        run: |
-          export JAVA_HOME=${JAVA_HOME_21_X64}
-          export PATH=$JAVA_HOME/bin:$PATH
-      - name: Cache Gradle Packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      - name: Run PMD Analysis
-        run: ./gradlew pmdMain
-
-  checkstyle:
-    name: Checkstyle Analysis
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Set Java 21 as default
-        run: |
-          export JAVA_HOME=${JAVA_HOME_21_X64}
-          export PATH=$JAVA_HOME/bin:$PATH
-      - name: Cache Gradle Packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      - name: Run Checkstyle
-        run: ./gradlew checkstyleMain
-
   unit-test:
     name: Unit Tests
     runs-on: ubuntu-latest
     needs: build
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
@@ -87,21 +50,14 @@ jobs:
       - name: Run Unit Tests
         run: ./gradlew test
 
-  tests-terminated:
-    name: test end node
-    runs-on: ubuntu-latest
-    needs: [build, pmd, checkstyle, unit-test]
-    steps:
-      - run: echo "finished test stage" # this is a indirection to the previous test steps
-
   docker-image-native:
     name: Docker image native
     if: github.event_name == 'push' && github.ref_name == 'main'
-    needs: [tests-terminated]
+    needs: [unit-test]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and Push Image
         uses: explorviz/deployment/.github/actions/build-and-deploy-quarkus-native@main
         with:
@@ -114,11 +70,11 @@ jobs:
   docker-image-jvm:
     name: Docker image JVM
     if: github.event_name == 'push' && github.ref_name == 'main'
-    needs: [tests-terminated]
+    needs: [unit-test]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and Push Image
         uses: explorviz/deployment/.github/actions/build-and-deploy-quarkus-jvm@main
         with: