diff --git a/.github/workflows/build-adapter.yml b/.github/workflows/build-adapter.yml
index 949d3769d2..2f7502217f 100644
--- a/.github/workflows/build-adapter.yml
+++ b/.github/workflows/build-adapter.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build Adapter
         uses: ./.github/actions/build-adapter
         with:
diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
index 831c605519..45366785c9 100644
--- a/.github/workflows/build-plugin.yml
+++ b/.github/workflows/build-plugin.yml
@@ -4,14 +4,14 @@ on: [workflow_call]
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup Java 
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build Plugin
         uses: ./.github/actions/build-plugin
       - name: Upload Plugin