diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml
index db49657542..024c8b6c47 100644
--- a/.github/workflows/java.yaml
+++ b/.github/workflows/java.yaml
@@ -14,30 +14,21 @@ on:
 jobs:
   tests-java-1_8:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
+    container: ubuntu:20.04
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4.7.1
+        with:
+          java-version: "11"
+          distribution: "temurin"
+      - name: Update apt and install unzip
+        run: |
+          apt-get update
+          apt-get install -y unzip make
+        shell: bash
       - uses: gradle/gradle-build-action@v3
         with:
           gradle-version: 7.1.1
       - name: Run tests
         run: make test-java
-
-# sonarqube:
-#   name: SonarQube
-#   runs-on: ubuntu-20.04
-#   steps:
-#     - uses: actions/checkout@v4
-#       with:
-#         fetch-depth: 0
-#     - uses: gradle/gradle-build-action@v3
-#       with:
-#         gradle-version: 7.1.1
-#     - name: Run tests
-#       run: make test-java
-#
-#     - name: Run sonarqube
-#       env:
-#         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#       run: (cd java && gradle sonarqube)
diff --git a/.github/workflows/javascript.yaml b/.github/workflows/javascript.yaml
index 4a5135aa93..9e38a85c1e 100644
--- a/.github/workflows/javascript.yaml
+++ b/.github/workflows/javascript.yaml
@@ -17,7 +17,7 @@ on:
 jobs:
   coverage:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/test_validate.yaml b/.github/workflows/test_validate.yaml
index c0e513c852..15631c60a6 100644
--- a/.github/workflows/test_validate.yaml
+++ b/.github/workflows/test_validate.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test_validation:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
index 0fa6ec9043..36476ae7d1 100644
--- a/.github/workflows/validate.yaml
+++ b/.github/workflows/validate.yaml
@@ -6,17 +6,17 @@ on:
       - "spec/**"
   push:
     branches:
-      - 'v*-release'
-      - 'starling-v*-release'
-      - 'libsbp-v*-release'
+      - "v*-release"
+      - "starling-v*-release"
+      - "libsbp-v*-release"
     tags:
-      - 'v*'
+      - "v*"
     paths:
       - "spec/**"
 
 jobs:
   validation:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Current Spec
         uses: actions/checkout@v4