diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82f6ab3b..e2feb3b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ ubuntu:
     expire_in: 2 days
 
 flatpak:
-  image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
+  image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.38'
   variables:
     APP_ID: org.gnome.Geary.Devel
     FLATPAK_MODULE: geary
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index 0dd89a18..9d2dee1c 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -14,7 +14,7 @@
 app-id: org.gnome.Geary.Devel
 branch: master
 runtime: org.gnome.Platform
-runtime-version: master
+runtime-version: "3.38"
 sdk: org.gnome.Sdk
 command: geary
 
@@ -152,7 +152,7 @@ modules:
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/evolution-data-server.git
-        branch: master
+        branch: gnome-3-38
     cleanup:
       - /lib/cmake
       - /lib/evolution-data-server/*-backends
@@ -242,4 +242,4 @@ modules:
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/geary.git
-        branch: mainline
+        branch: gnome-3-38