diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
new file mode 100644
index 0000000..3aae3be
--- /dev/null
+++ b/.github/workflows/flatpak.yml
@@ -0,0 +1,19 @@
+on:
+  push:
+    branches: [main]
+  pull_request:
+name: Build flatpak
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: palette.flatpak
+        manifest-path: me.ppvan.psequel.json
+        cache-key: flatpak-builder-${{ github.sha }}
\ No newline at end of file
diff --git a/data/me.ppvan.psequel.appdata.xml.in b/data/me.ppvan.psequel.appdata.xml.in
deleted file mode 100644
index f719ffe..0000000
--- a/data/me.ppvan.psequel.appdata.xml.in
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-	<id>me.ppvan.psequel.desktop</id>
-    <name>PSequel</name>
-    <summary>Run your SQL query</summary>
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>GPL-3.0-or-later</project_license>
-	<description>
-	    <p>Basic features of a SQL client</p>
-        <ul>
-            <li>Create connection, import, export connection to database</li>
-            <li>View tables, scshema, views, columns, indexes, foreign key</li>
-            <li>Execute query, query history</li>
-        </ul>
-
-        <p>This project is not a part of or affiliated with PostgreSQL.</p>
-	</description>
-    <provides>
-        <binary>psequel</binary>
-    </provides>
-    <developer_name>ppvan</developer_name>
-  <url type="homepage">https://github.com/ppvan/psequel</url>
-  <url type="bugtracker">https://github.com/ppvan/psequel/issues</url>
-  <requires>
-    <display_length compare="ge">medium</display_length>
-  </requires>
-   <recommends>
-    <control>keyboard</control>
-  </recommends>
-   <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot1.png</image>
-    </screenshot>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot2.png</image>
-    </screenshot>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot3.png</image>
-    </screenshot>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot4.png</image>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1" />
-  <releases>
-
-    <release version="0.1.9" date="2023-02-18">
-      <description>
-        <p>Clean up and bug fix</p>
-        <p>Show number of tables and views</p>
-      </description>
-    </release>
-
-    <release version="0.1.5" date="2023-08-15">
-      <description>
-        <p>Basic autocompletion</p>
-      </description>
-    </release>
-
-    <release version="0.1.4" date="2023-08-11">
-      <description>
-        <p>First Release</p>
-      </description>
-    </release>
-  </releases>
-</component>
diff --git a/data/me.ppvan.psequel.desktop.in b/data/me.ppvan.psequel.desktop.in
index 1395bf0..3ea7d33 100644
--- a/data/me.ppvan.psequel.desktop.in
+++ b/data/me.ppvan.psequel.desktop.in
@@ -4,5 +4,5 @@ Exec=psequel
 Icon=me.ppvan.psequel
 Terminal=false
 Type=Application
-Categories=GTK;Development;
+Categories=Development;Database;
 StartupNotify=true
diff --git a/data/me.ppvan.psequel.metainfo.xml.in b/data/me.ppvan.psequel.metainfo.xml.in
new file mode 100644
index 0000000..0720e22
--- /dev/null
+++ b/data/me.ppvan.psequel.metainfo.xml.in
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>me.ppvan.psequel</id>
+
+    <name>psequel</name>
+    <summary>A simple SQL client</summary>
+
+    <metadata_license>MIT</metadata_license>
+    <project_license>GPL-3.0-or-later</project_license>
+
+    <recommends>
+        <display_length compare="ge">960</display_length>
+    </recommends>
+
+    <description>
+        <p>Psequel is a modern, yet minial SQL client.</p>
+        <ul>
+            <li>Create connection, import, export connection to database</li>
+            <li>View tables, scshema, views, columns, indexes, foreign key</li>
+            <li>Execute query, query history</li>
+        </ul>
+
+        <p>
+            This project is not a part of or affiliated with PostgreSQL.
+        </p>
+    </description>
+    <content_rating type="oars-1.1" />
+    <provides>
+        <binary>psequel</binary>
+    </provides>
+    <url type="homepage">https://github.com/ppvan/psequel</url>
+    <url type="bugtracker">https://github.com/ppvan/psequel/issues</url>
+
+    <developer id="io.github.jtheoof">
+        <name>Jeremy Attali</name>
+        <url>https://github.com/jtheoof</url>
+    </developer>
+    <launchable type="desktop-id">me.ppvan.psequel.desktop</launchable>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot1.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot2.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot3.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot4.png</image>
+        </screenshot>
+    </screenshots>
+
+    <releases>
+        <release version="0.1.9" date="2023-02-18">
+            <description>
+                <p>Clean up and bug fix</p>
+                <p>Show number of tables and views</p>
+            </description>
+        </release>
+        <release version="0.1.5" date="2023-08-15">
+            <description>
+                <p>Basic autocompletion</p>
+            </description>
+        </release>
+        <release version="0.1.4" date="2023-08-11">
+            <description>
+                <p>First Release</p>
+            </description>
+        </release>
+    </releases>
+</component>
\ No newline at end of file
diff --git a/data/meson.build b/data/meson.build
index 2122927..5514119 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -12,18 +12,10 @@ if desktop_utils.found()
   test('Validate desktop file', desktop_utils, args: [desktop_file])
 endif
 
-i18n.merge_file(
-        input: 'me.ppvan.psequel.appdata.xml.in',
-       output: 'me.ppvan.psequel.appdata.xml',
-       po_dir: '../po',
-      install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
-)
-
 
 appstream_file = i18n.merge_file(
-        input: 'example.com.temp.metainfo.xml.in',
-       output: 'example.com.temp.metainfo.xml',
+        input: 'me.ppvan.psequel.metainfo.xml.in',
+       output: 'me.ppvan.psequel.metainfo.xml',
        po_dir: '../po',
       install: true,
   install_dir: get_option('datadir') / 'metainfo'
diff --git a/me.ppvan.psequel.json b/me.ppvan.psequel.json
index 2b55208..5c4933d 100644
--- a/me.ppvan.psequel.json
+++ b/me.ppvan.psequel.json
@@ -11,6 +11,10 @@
         "--device=dri",
         "--socket=wayland"
     ],
+    "build-options": {
+        "append-path": "/usr/lib/sdk/vala/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/vala/lib"
+    },
     "cleanup": [
         "/include",
         "/lib/pkgconfig",
@@ -27,12 +31,10 @@
         {
             "name": "psequel",
             "buildsystem": "meson",
-            "builddir": true,
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/ppvan/psequel",
-                    "commit": "33a0704cbbc7ab7ef8483404a4578319c001b1f9"
+                    "type": "dir",
+                    "path": "."
                 }
             ],
             "modules": [
diff --git a/project.doap b/project.doap
deleted file mode 100644
index cb66d09..0000000
--- a/project.doap
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">Psequel</name>
-  <platform>GTK 4</platform>
-  <platform>Libadwaita</platform>
-  <shortdesc xml:lang="en">Run some SQL queries</shortdesc>
-  <description xml:lang="en">Run query, connect to database, view schema, table info</description>
-  <homepage rdf:resource="https://github.com/ppvan/psequel"/>
-  <bug-database rdf:resource="https://github.com/ppvan/psequel/issues" />
-
-  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
-  <programming-language>Vala</programming-language>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>ppvan</foaf:name>
-      <foaf:mbox rdf:resource="mailto:phuclaplace@gmail.com" />
-      <foaf:account>
-        <foaf:OnlineAccount>
-          <foaf:accountServiceHomepage rdf:resource="https://github.com"/>
-          <foaf:accountName>ppvan</foaf:accountName>
-        </foaf:OnlineAccount>
-      </foaf:account>
-    </foaf:Person>
-  </maintainer>
-</Project>
\ No newline at end of file