diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80d99826fb33c0b4c553fb57359938ed54b65a57..08dfb14a2549bc577be42a01817aed94275f1004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ flatpak:
   image: fedora:latest
   stage: build
   variables:
-    MANIFEST_PATH: "build-aux/uk.me.bcowan.Rugby.json"
+    MANIFEST_PATH: "build-aux/uk.me.bcowan.Rugby.yml"
     RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
     FLATPAK_MODULE: "rugby"
     BUNDLE: "rugby.flatpak"
@@ -14,8 +14,8 @@ flatpak:
   script:
   - dnf install -y flatpak-builder
   - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  - flatpak install -y flathub org.gnome.Platform 3.34
-  - flatpak install -y flathub org.gnome.Sdk 3.34
+  - flatpak install -y flathub org.gnome.Platform 3.36
+  - flatpak install -y flathub org.gnome.Sdk 3.36
   - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
   - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
   - flatpak build app ninja -C _build install
diff --git a/build-aux/uk.me.bcowan.Rugby.json b/build-aux/uk.me.bcowan.Rugby.json
deleted file mode 100644
index 9ca1d284e27793054d9285eb6ae3ecde7fc6c446..0000000000000000000000000000000000000000
--- a/build-aux/uk.me.bcowan.Rugby.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "app-id" : "uk.me.bcowan.Rugby",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.34",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "rugby",
-    "finish-args" : [
-        "--socket=x11",
-        "--socket=wayland"
-    ],
-    "modules" : [
-        {
-            "name" : "rugby",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://git.fossgalaxy.com/SuborbitalPigeon/rugby.git"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-        }
-    }
-}
diff --git a/build-aux/uk.me.bcowan.Rugby.json.license b/build-aux/uk.me.bcowan.Rugby.json.license
deleted file mode 100644
index bad77ac18a6366d4cb9aa8204bb7a15f4e690517..0000000000000000000000000000000000000000
--- a/build-aux/uk.me.bcowan.Rugby.json.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2018 Bruce Cowan <bruce@bcowan.me.uk>
-SPDX-License-Identifier: CC0-1.0
diff --git a/build-aux/uk.me.bcowan.Rugby.yml b/build-aux/uk.me.bcowan.Rugby.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fef3fcb40ef26379836a2d4a7239751e23a57d04
--- /dev/null
+++ b/build-aux/uk.me.bcowan.Rugby.yml
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2018-2020 Bruce Cowan <bruce@bcowan.me.uk>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+app-id: uk.me.bcowan.rugby
+runtime: org.gnome.Platform
+runtime-version: "3.36"
+sdk: org.gnome.Sdk
+command: rugby
+
+finish-args:
+  - "--socket=x11"
+  - "--socket=wayland"
+
+modules:
+  name: rugby
+  buildsystem: meson
+  builddir: true
+  sources:
+    - type: git
+      url: https://git.fossgalaxy.com/SuborbitalPigeon/rugby.git