diff --git a/.github/workflows/cmake-cross-compile.yml b/.github/workflows/cmake-cross-compile.yml
index 863a7e9..949bc84 100644
--- a/.github/workflows/cmake-cross-compile.yml
+++ b/.github/workflows/cmake-cross-compile.yml
@@ -8,7 +8,8 @@ env:
 
 jobs:
   build-anisette-server-aarch64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container: ubuntu:23.04
 
     steps:
     - uses: actions/checkout@v3
@@ -16,9 +17,7 @@ jobs:
         submodules: recursive
 
     - name: Install dependencies
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
-        sudo apt-get update && sudo apt-get install -y gdc-13-aarch64-linux-gnu dub libz-dev
+      run: sudo apt-get update && sudo apt-get install -y gdc-13-aarch64-linux-gnu dub libz-dev
 
     - name: Build
       run: dub build :anisette-server -b release --compiler=aarch64-linux-gnu-gdc-13 -c "static"
@@ -37,7 +36,8 @@ jobs:
           ${{github.workspace}}/bin/anisette-server-aarch64.dbg
 
   build-anisette-server-armv7:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container: ubuntu:23.04
 
     steps:
     - uses: actions/checkout@v3
@@ -45,9 +45,7 @@ jobs:
         submodules: recursive
 
     - name: Install dependencies
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
-        sudo apt-get update && sudo apt-get install -y gdc-13-arm-linux-gnueabihf dub libz-dev
+      run: sudo apt-get update && sudo apt-get install -y gdc-13-arm-linux-gnueabihf dub libz-dev
 
     - name: Build
       run: dub build :anisette-server -b release --compiler=arm-linux-gnueabihf-gdc-13 -c "static"
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 8d38d13..0562b64 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -36,7 +36,8 @@ jobs:
             ${{github.workspace}}/bin/anisette-server-x86_64.dbg
 
   build-anisette-server-i686:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container: ubuntu:23.04
 
     steps:
       - uses: actions/checkout@v3
@@ -44,9 +45,7 @@ jobs:
           submodules: recursive
 
       - name: Install dependencies
-        run: |
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
-          sudo apt-get update && sudo apt-get install -y gdc-13-i686-linux-gnu dub libz-dev
+        run: sudo apt-get update && sudo apt-get install -y gdc-13-i686-linux-gnu dub libz-dev
 
       - name: Build
         run: dub build :anisette-server -b release --compiler=i686-linux-gnu-gdc-13 -c "static"