diff --git a/flatpak/com.github.upscayl.upscayl.json b/flatpak/org.upscayl.app.json
similarity index 59%
rename from flatpak/com.github.upscayl.upscayl.json
rename to flatpak/org.upscayl.app.json
index c7e5a10..e552057 100644
--- a/flatpak/com.github.upscayl.upscayl.json
+++ b/flatpak/org.upscayl.app.json
@@ -1,5 +1,5 @@
 {
-  "app-id": "com.github.upscayl.upscayl",
+  "app-id": "org.upscayl.app",
   "runtime": "org.freedesktop.Platform",
   "runtime-version": "22.08",
   "sdk": "org.freedesktop.Sdk",
@@ -27,21 +27,17 @@
     {
       "name": "upscayl",
       "buildsystem": "simple",
-      "cleanup": [
-        "upscayl-1.5.5.zip"
-      ],
+      "cleanup": ["upscayl-1.5.5.zip"],
       "sources": [
         {
           "type": "file",
-          "only-arches": [
-            "x86_64"
-          ],
+          "only-arches": ["x86_64"],
           "url": "https://github.com/JanDeDinoMan/upscayl/releases/download/v1.5.5/upscayl-1.5.5.zip",
           "sha256": "0e57b3cbb96299fac6beea185ffdf2f105d3258ac6081bd1f3c408912541dacc"
         },
         {
           "type": "file",
-          "path": "com.github.upscayl.upscayl.metainfo.xml"
+          "path": "org.upscayl.app.metainfo.xml"
         },
         {
           "type": "file",
@@ -50,9 +46,7 @@
         {
           "type": "script",
           "dest-filename": "upscayl-wrapper",
-          "commands": [
-            "zypak-wrapper /app/upscayl/upscayl"
-          ]
+          "commands": ["zypak-wrapper /app/upscayl/upscayl"]
         }
       ],
       "build-commands": [
@@ -60,13 +54,13 @@
         "unzip upscayl-1.5.5 -d /app/upscayl",
         "install upscayl-wrapper /app/bin/",
         "install -d /app/share/icons/hicolor/512x512/apps/",
-        "install icon.png /app/share/icons/hicolor/512x512/apps/com.github.upscayl.upscayl.png",
+        "install icon.png /app/share/icons/hicolor/512x512/apps/org.upscayl.app.png",
         "install -d /app/share/applications",
-        "touch com.github.upscayl.upscayl.desktop",
-        "install -Dp -m644 com.github.upscayl.upscayl.metainfo.xml /app/share/metainfo/com.github.upscayl.upscayl.metainfo.xml",
-        "install -m644 com.github.upscayl.upscayl.desktop /app/share/applications/com.github.upscayl.upscayl.desktop",
-        "desktop-file-edit --set-key=Exec --set-value='upscayl-wrapper %U' --set-key=Icon --set-value='com.github.upscayl.upscayl' --set-key=Comment --set-value='Upscale Images' --set-key=Name --set-value='Upscayl' --set-key=StartupNotify --set-value='false' --set-key=Categories --set-value='ImageProcessing;RasterGraphics;Graphics;' --set-key=Type --set-value='Application' /app/share/applications/com.github.upscayl.upscayl.desktop"
+        "touch org.upscayl.app.desktop",
+        "install -Dp -m644 org.upscayl.app.metainfo.xml /app/share/metainfo/org.upscayl.app.metainfo.xml",
+        "install -m644 org.upscayl.app.desktop /app/share/applications/org.upscayl.app.desktop",
+        "desktop-file-edit --set-key=Exec --set-value='upscayl-wrapper %U' --set-key=Icon --set-value='org.upscayl.app' --set-key=Comment --set-value='Upscale Images' --set-key=Name --set-value='Upscayl' --set-key=StartupNotify --set-value='false' --set-key=Categories --set-value='ImageProcessing;RasterGraphics;Graphics;' --set-key=Type --set-value='Application' /app/share/applications/org.upscayl.app.desktop"
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/flatpak/com.github.upscayl.upscayl.metainfo.xml b/flatpak/org.upscayl.app.metainfo.xml
similarity index 73%
rename from flatpak/com.github.upscayl.upscayl.metainfo.xml
rename to flatpak/org.upscayl.app.metainfo.xml
index 9532f85..a7c59f3 100644
--- a/flatpak/com.github.upscayl.upscayl.metainfo.xml
+++ b/flatpak/org.upscayl.app.metainfo.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <component type="desktop">
-    <id>com.github.upscayl.upscayl</id>
+    <id>org.upscayl.app</id>
     <name>Upscayl</name>
     <summary>Free and Open Source AI Image Upscaler</summary>
-    <developer_name>Nayam Amarshe</developer_name>
-    <launchable type="desktop-id">com.github.upscayl.upscayl.desktop</launchable>
+    <developer_name>Nayam Amarshe, TGS963</developer_name>
+    <launchable type="desktop-id">org.upscayl.app.desktop</launchable>
     <metadata_license>FSFAP</metadata_license>
     <project_license>AGPL-3.0</project_license>
     <description>
@@ -20,6 +20,10 @@
     <content_rating type="oars-1.1" />
     <keywords>
         <keyword>upscale</keyword>
+        <keyword>topaz</keyword>
+        <keyword>gigapixel</keyword>
+        <keyword>waifu2x</keyword>
+        <keyword>ai</keyword>
     </keywords>
     <translation type="gettext">Upscayl</translation>
 </component>
\ No newline at end of file