diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4437814..c92262d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,10 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Setup Java and Maven
-      uses: s4u/setup-maven-action@v1.11.0
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v4.5
       with:
-        java-version: 17
         maven-version: 3.9.2
     - name: Build (mvn package)
       run: mvn -B package --file com.eclipsesource.megit.parent/pom.xml
+  
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index c3e2f47..0e66b22 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -8,10 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Setup Java and Maven
-      uses: s4u/setup-maven-action@v1.11.0
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v4.5
       with:
-        java-version: 17
         maven-version: 3.9.2
     - name: Build (mvn package)
       run: mvn -B package --file com.eclipsesource.megit.parent/pom.xml