diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 46aec1280..86ea141a6 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,27 +12,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'corretto'
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: install jq
-      run:  sudo apt-get install -y jq
-
-    - name: Cache Gradle packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        cache: 'gradle'
 
     - name: Build with Gradle
-      run: ./gradlew build --info
+      run: ./gradlew build --info --no-daemon
 
     - name: Codacy Coverage Reporter
       uses: codacy/codacy-coverage-reporter-action@v1
diff --git a/.github/workflows/maven-central.yml b/.github/workflows/maven-central.yml
index 3d9d523d3..3ce1c6126 100644
--- a/.github/workflows/maven-central.yml
+++ b/.github/workflows/maven-central.yml
@@ -10,21 +10,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'gradle'
 
       - name: Build with Gradle
         env: