diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fc139f..35fdfaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,9 +22,9 @@ build-flatpak:
     - git submodule update --init --recursive
   script:
     - cd flatpak
-    - flatpak-builder --force-clean --repo=repo build-dir org.eu.encom.matrique.json
+    - flatpak-builder --force-clean --repo=repo build-dir org.eu.encom.matrique.yaml
     - flatpak build-bundle repo matrique.flatpak org.eu.encom.matrique
     - cd ../
   artifacts:
     paths:
-    - flatpak/matrique.flatpak
\ No newline at end of file
+    - flatpak/matrique.flatpak
diff --git a/flatpak/org.eu.encom.matrique.json b/flatpak/org.eu.encom.matrique.json
deleted file mode 100644
index 127afa3..0000000
--- a/flatpak/org.eu.encom.matrique.json
+++ /dev/null
@@ -1,42 +0,0 @@
-
-{
-    "id": "org.eu.encom.matrique",
-    "rename-icon": "matrique",
-    "rename-desktop-file": "matrique.desktop",
-    "rename-appdata-file": "matrique.appdata.xml",
-    "runtime": "org.kde.Platform",
-    "runtime-version": "5.11",
-    "sdk": "org.kde.Sdk",
-    "command": "matrique",
-    "finish-args": [
-        "--share=ipc",
-        "--share=network",
-        "--socket=x11",
-        "--socket=wayland",
-        "--device=dri",
-	"--filesystem=home:rw",
-	"--filesystem=/tmp:rw",
-	"--talk-name=org.freedesktop.Notifications",
-	"--talk-name=org.kde.StatusNotifierWatcher"
-    ],
-    "modules": [
-        {
-            "name": "matrique",
-            "buildsystem": "qmake",
-            "post-install": [
-		"install -D matrique /app/bin/matrique",
-		"install -D matrique.desktop /app/share/applications/matrique.desktop",
-		"mkdir -p /app/share/appdata",
-		"install -D matrique.appdata.xml /app/share/appdata/",
-		 "for i in 16x16 32x32 128x128 256x256 512x512; do install -Dm644 icons/${i}.png /app/share/icons/hicolor/${i}/apps/matrique.png; done"
-            ],
-            "sources": [
-                {
-                    "type": "dir",
-                    "path": "../"
-                }
-            ]
-        }
-    ]
-}
-
diff --git a/flatpak/org.eu.encom.matrique.yaml b/flatpak/org.eu.encom.matrique.yaml
new file mode 100644
index 0000000..c0f060c
--- /dev/null
+++ b/flatpak/org.eu.encom.matrique.yaml
@@ -0,0 +1,23 @@
+---
+id: org.eu.encom.matrique
+runtime: org.kde.Platform
+runtime-version: '5.11'
+sdk: org.kde.Sdk
+command: matrique
+finish-args:
+- "--share=ipc"
+- "--share=network"
+- "--socket=x11"
+- "--socket=wayland"
+- "--device=dri"
+- "--filesystem=home"
+- "--filesystem=/tmp"
+- "--talk-name=org.freedesktop.Notifications"
+- "--talk-name=org.kde.StatusNotifierWatcher"
+modules:
+- name: matrique
+  buildsystem: qmake
+  sources:
+  - type: dir
+    path: ../
+