diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f3d92ce..0d3c2c1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   push:
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-24.04'
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b8d1835..a62eb7e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,16 +13,21 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        image: [ ubuntu-20.04, windows-2019 ]
+        image:
+          - ubuntu-24.04
+          - windows-2019
     steps:
       - uses: actions/checkout@v2
-      - name: SBT Cache
-        uses: actions/cache@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          path: |
-            ~/.ivy2/cache
-            ~/.sbt
-          key: main.${{ runner.os }}.sbt.${{ hashFiles('**/*.sbt') }}+${{ hashFiles('project/build.properties') }}
+          distribution: 'corretto'
+          java-version: '11'
+          cache: 'sbt'
+
+      - name: Set up SBT
+        uses: sbt/setup-sbt@v1
 
       - name: Build
         run: sbt dist
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 91b1073..b8d4d81 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -41,13 +41,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: SBT Cache
-        uses: actions/cache@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          path: |
-            ~/.ivy2/cache
-            ~/.sbt
-          key: test.${{ runner.os }}.sbt.${{ hashFiles('**/*.sbt') }}+${{ hashFiles('project/build.properties') }}
+          distribution: 'corretto'
+          java-version: '11'
+          cache: 'sbt'
+
+      - name: Set up SBT
+        uses: sbt/setup-sbt@v1
 
       - name: Database Setup
         run: psql postgresql://horta:hell@localhost/loglist -c 'create extension pgcrypto;'