diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 292181bca..62a223d62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,15 +11,12 @@ jobs:
     name: Test JDK ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          java-package: 'jdk'
+          distribution: 'adopt'
+          cache: 'gradle'
       - name: Build
         run: ./gradlew build
       - name: Upload Unit Test Results
@@ -56,15 +53,19 @@ jobs:
     name: Test webui builds
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-node@v2
         with:
-          java-version: 8
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
+          node-version: '16'
+          cache: 'npm'
+          cache-dependency-path: |
+            package-lock.json
+            komga-webui/package-lock.json
+      - uses: actions/setup-java@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          java-version: '8'
+          java-package: 'jdk'
+          distribution: 'adopt'
+          cache: 'gradle'
       - name: npmBuild
         run: ./gradlew npmBuild
       - name: npmTest
@@ -78,18 +79,24 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: 13.x
-      - uses: actions/setup-java@v1
+          node-version: '16'
+          cache: 'npm'
+          cache-dependency-path: |
+            package-lock.json
+            komga-webui/package-lock.json
+      - uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: '8'
+          java-package: 'jdk'
+          distribution: 'adopt'
+          cache: 'gradle'
       - name: Install dependencies
         run: npm install --only=production
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to Docker Hub
         uses: docker/login-action@v1