diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 85f3816c9e8..a53212cdd34 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -28,11 +28,6 @@ jobs:
           gradle-home-cache-cleanup: true
           cache-read-only: false
           arguments: compileJava compileTestJava -Dorg.gradle.parallel=true
-      - name: save classes
-        uses: actions/upload-artifact@v3
-        with:
-          name: classes
-          path: "**/*.class"
   compileJmh:
     runs-on: ubuntu-22.04
     needs: compile
@@ -47,11 +42,22 @@ jobs:
           distribution: adopt
           java-version: 17
           cache: gradle
-      - name: Restore classes
-        uses: actions/download-artifact@v3
-        with:
-          name: classes
       - name: compileJmh
         uses: gradle/gradle-build-action@v2
         with:
           arguments: compileJmh
+
+  javadoc_17:
+    runs-on: ubuntu-22.04
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Set up Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: adopt
+          java-version: 17
+          cache: gradle
+      - name: javadoc (JDK 17)
+        run: ./gradlew --no-daemon javadoc
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 347a5b008d3..9860d241068 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   validation:
     name: "Gradle Wrapper Validation"
-    runs-on: [ Linux ]
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index a4e32466e9a..991af8952da 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   javadoc_17:
-    runs-on: [ self-hosted ]
+    runs-on: ubuntu-22.04
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - name: Checkout Repo
diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
index 93fece9d3b1..9421b0e50eb 100644
--- a/.github/workflows/repolinter.yml
+++ b/.github/workflows/repolinter.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   lint:
-    runs-on: [ Linux ]
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
index 662d955f37e..ab8fd3ec9fb 100644
--- a/.github/workflows/spotless.yml
+++ b/.github/workflows/spotless.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   spotless:
-    runs-on: [ Linux ]
+    runs-on: ubuntu-22.04
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - name: Checkout Repo