diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index cd292048dda..0a8f0772469 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -278,6 +278,9 @@ jobs:
 
   snap:
     name: Build Snap
+    # Note, before updating the ubuntu version of the workflow, ensure the snap base image
+    # is equal or greater than the new version. Otherwise there might be GLIBC version issues.
+    # The snap base for CLI is defined in `apps/cli/stores/snap/snapcraft.yaml`
     runs-on: ubuntu-22.04
     needs: [setup, cli]
     env:
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index e285bec0f80..c4f004b3f16 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -124,6 +124,9 @@ jobs:
 
   linux:
     name: Linux Build
+    # Note, before updating the ubuntu version of the workflow, ensure the snap base image
+    # is equal or greater than the new version. Otherwise there might be GLIBC version issues.
+    # The snap base for desktop is defined in `apps/desktop/electron-builder.json`
     runs-on: ubuntu-22.04
     needs: setup
     env:
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 518f6aa5291..e960e944c33 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -166,6 +166,7 @@
   },
   "snap": {
     "autoStart": true,
+    "base": "core22",
     "confinement": "strict",
     "plugs": ["default", "password-manager-service"],
     "stagePackages": ["default"]