diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16ffed828..7cef92fc3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
       options: --privileged
 
     steps:
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 613772d58..ebd61cabe 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
       options: --privileged
 
     steps:
diff --git a/io.elementary.mail.json b/io.elementary.mail.json
index 661b04776..e7bb2f440 100644
--- a/io.elementary.mail.json
+++ b/io.elementary.mail.json
@@ -1,7 +1,7 @@
 {
-    "app-id": "io.elementary.mail",
+    "id": "io.elementary.mail",
     "runtime": "io.elementary.Platform",
-    "runtime-version": "8",
+    "runtime-version": "8.2",
     "sdk": "io.elementary.Sdk",
     "command": "io.elementary.mail",
     "finish-args": [
@@ -51,7 +51,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
-                    "tag": "3.52.4"
+                    "tag": "3.56.2"
                 }
             ],
             "modules": [
@@ -103,13 +103,14 @@
                 "-Dofono_backend=false",
                 "-Dtelepathy_backend=false",
                 "-Dimport_tool=false",
-                "-Dinspect_tool=false"
+                "-Dinspect_tool=false",
+                "-Dlibdir=/app/lib"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/folks.git",
-                    "tag": "0.15.5"
+                    "tag": "0.15.9"
                 }
             ]
         },