diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml
index 36eaaef1c..0b24e399e 100644
--- a/.github/actions/ci-setup/action.yml
+++ b/.github/actions/ci-setup/action.yml
@@ -24,7 +24,7 @@ runs:
         go-version: "1.23.3"
 
     - name: "Install native packages"
-      if: inputs.matrix-os == 'ubuntu-20.04'
+      if: inputs.matrix-os == 'ubuntu-24.04'
       run: |
         sudo apt-get update
         sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf rpm
@@ -34,14 +34,14 @@ runs:
     # flatpak gnome-software-plugin-flatpak flatpak-builder elfutils
 
     # - name: "Setup Flatpak"
-    #   if: inputs.matrix-os == 'ubuntu-20.04'
+    #   if: inputs.matrix-os == 'ubuntu-24.04'
     #   run: |
     #     sudo flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     #   shell: bash
 
     - name: Setup cache Ubuntu
       uses: actions/cache@v3
-      if: inputs.matrix-os == 'ubuntu-20.04'
+      if: inputs.matrix-os == 'ubuntu-24.04'
       with:
         path: |
           ~/.cache/go-build
diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml
index c84c89f2e..0a97be035 100644
--- a/.github/workflows/desktop-release.yml
+++ b/.github/workflows/desktop-release.yml
@@ -54,15 +54,15 @@ jobs:
     strategy:
       matrix:
         config:
-          #- os: macos-latest-xl
-          #  arch: x64
-          #  goarch: amd64
-          #  daemon_name: x86_64-apple-darwin
-          #- os: macos-latest-xl
-          #  arch: arm64
-          #  goarch: arm64
-          #  daemon_name: aarch64-apple-darwin
-          - os: ubuntu-20.04
+          - os: macos-latest
+            arch: x64
+            goarch: amd64
+            daemon_name: x86_64-apple-darwin
+          - os: macos-latest
+            arch: arm64
+            goarch: arm64
+            daemon_name: aarch64-apple-darwin
+          - os: ubuntu-24.04
             arch: x64
             goarch: amd64
             daemon_name: x86_64-unknown-linux-gnu
diff --git a/.github/workflows/test-desktop.yml b/.github/workflows/test-desktop.yml
index 0a514a33c..b28f7f390 100644
--- a/.github/workflows/test-desktop.yml
+++ b/.github/workflows/test-desktop.yml
@@ -42,7 +42,7 @@ jobs:
             arch: arm64
             goarch: arm64
             daemon_name: aarch64-apple-darwin
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             arch: x64
             goarch: amd64
             daemon_name: x86_64-unknown-linux-gnu