diff --git a/build-aux/flatpak/org.gnome.gedit.json b/build-aux/flatpak/org.gnome.gedit.json
index 90fe5cfb4..62cfffab9 100644
--- a/build-aux/flatpak/org.gnome.gedit.json
+++ b/build-aux/flatpak/org.gnome.gedit.json
@@ -44,15 +44,14 @@
       "buildsystem": "meson",
       "config-opts": [
         "-Dlua51=false",
-        "-Dvapi=true",
-        "-Ddemos=false",
-        "-Dglade_catalog=false"
+        "-Dglade_catalog=false",
+        "-Ddemos=false"
       ],
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/libpeas/1.34/libpeas-1.34.0.tar.xz",
-          "sha256": "4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0"
+          "url": "https://download.gnome.org/sources/libpeas/1.36/libpeas-1.36.0.tar.xz",
+          "sha256": "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
         }
       ]
     },
@@ -64,40 +63,46 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/gspell/1.12/gspell-1.12.0.tar.xz",
-          "sha256": "40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad"
+          "url": "https://download.gnome.org/sources/gspell/1.12/gspell-1.12.2.tar.xz",
+          "sha256": "b4e993bd827e4ceb6a770b1b5e8950fce3be9c8b2b0cbeb22fdf992808dd2139"
         }
       ]
     },
     {
-      "name": "amtk",
-      "buildsystem": "meson",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.gnome.org/sources/amtk/5.6/amtk-5.6.1.tar.xz",
-          "sha256": "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228"
-        }
-      ]
-    },
-    {
-      "name": "gtksourceview",
+      "name": "libgedit-amtk",
       "buildsystem": "meson",
       "config-opts": [
-        "-Dinstall_tests=false",
         "-Dgtk_doc=false"
       ],
       "sources": [
         {
-          "type": "archive",
-          "url": "https://download.gnome.org/sources/gtksourceview/4.8/gtksourceview-4.8.4.tar.xz",
-          "sha256": "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d"
+          "type": "git",
+          "url": "https://github.com/gedit-technology/libgedit-amtk.git",
+          "branch": "main"
+        }
+      ]
+    },
+    {
+      "name": "libgedit-gtksourceview",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Dgtk_doc=false",
+        "-Dtests_relying_on_external_programs=false"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/gedit-technology/libgedit-gtksourceview.git",
+          "branch": "main"
         }
       ]
     },
     {
       "name": "tepl",
       "buildsystem": "meson",
+      "config-opts": [
+        "-Dgtk_doc=false"
+      ],
       "sources": [
         {
           "type": "git",
@@ -109,6 +114,9 @@
     {
       "name": "gedit",
       "buildsystem": "meson",
+      "config-opts": [
+        "-Dgtk_doc=false"
+      ],
       "sources": [
         {
           "type": "git",
diff --git a/build-aux/flatpak/org.gnome.gedit.yml b/build-aux/flatpak/org.gnome.gedit.yml
index 2bb32b8c9..526fa1958 100644
--- a/build-aux/flatpak/org.gnome.gedit.yml
+++ b/build-aux/flatpak/org.gnome.gedit.yml
@@ -47,41 +47,44 @@ modules:
     buildsystem: meson
     config-opts:
       - "-Dlua51=false"
-      - "-Dvapi=true"
-      - "-Ddemos=false"
       - "-Dglade_catalog=false"
+      - "-Ddemos=false"
     sources:
       - type: archive
-        url: https://download.gnome.org/sources/libpeas/1.34/libpeas-1.34.0.tar.xz
-        sha256: 4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0
+        url: https://download.gnome.org/sources/libpeas/1.36/libpeas-1.36.0.tar.xz
+        sha256: 297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c
 
   - name: gspell
     cleanup:
       - "/bin"
     sources:
       - type: archive
-        url: https://download.gnome.org/sources/gspell/1.12/gspell-1.12.0.tar.xz
-        sha256: 40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad
+        url: https://download.gnome.org/sources/gspell/1.12/gspell-1.12.2.tar.xz
+        sha256: b4e993bd827e4ceb6a770b1b5e8950fce3be9c8b2b0cbeb22fdf992808dd2139
 
-  - name: amtk
-    buildsystem: meson
-    sources:
-      - type: archive
-        url: https://download.gnome.org/sources/amtk/5.6/amtk-5.6.1.tar.xz
-        sha256: d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
-
-  - name: gtksourceview
+  - name: libgedit-amtk
     buildsystem: meson
     config-opts:
-      - "-Dinstall_tests=false"
       - "-Dgtk_doc=false"
     sources:
-      - type: archive
-        url: "https://download.gnome.org/sources/gtksourceview/4.8/gtksourceview-4.8.4.tar.xz"
-        sha256: 7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d
+      - type: git
+        url: https://github.com/gedit-technology/libgedit-amtk.git
+        branch: main
+
+  - name: libgedit-gtksourceview
+    buildsystem: meson
+    config-opts:
+      - "-Dgtk_doc=false"
+      - "-Dtests_relying_on_external_programs=false"
+    sources:
+      - type: git
+        url: https://github.com/gedit-technology/libgedit-gtksourceview.git
+        branch: main
 
   - name: tepl
     buildsystem: meson
+    config-opts:
+      - "-Dgtk_doc=false"
     sources:
       - type: git
         url: https://gitlab.gnome.org/swilmet/tepl.git
@@ -89,6 +92,8 @@ modules:
 
   - name: gedit
     buildsystem: meson
+    config-opts:
+      - "-Dgtk_doc=false"
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/gedit.git