diff --git a/packages/h/heroic-games-launcher/files/heroic.desktop b/packages/h/heroic-games-launcher/files/heroic.desktop
deleted file mode 100644
index f9c885374db..00000000000
--- a/packages/h/heroic-games-launcher/files/heroic.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Heroic Games Launcher
-Comment=An Open Source alternative to the Epic Games Launcher
-Exec=/usr/bin/heroic %U
-Icon=heroic
-Type=Application
-Categories=Game;
-Terminal=false
-StartupWMClass=Heroic
-MimeType=x-scheme-handler/heroic;
diff --git a/packages/h/heroic-games-launcher/package.yml b/packages/h/heroic-games-launcher/package.yml
index e3cdf89dd67..83031f2137d 100644
--- a/packages/h/heroic-games-launcher/package.yml
+++ b/packages/h/heroic-games-launcher/package.yml
@@ -1,9 +1,9 @@
 name       : heroic-games-launcher
 version    : 2.12.0
-release    : 23
+release    : 24
 source     :
     - git|https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher.git : v2.12.0
-homepage   : https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher
+homepage   : https://heroicgameslauncher.com/
 license    : GPL-3.0-or-later
 component  : games
 networking : yes
@@ -28,12 +28,16 @@ install    : |
 
     # Copy dist files and link binaries
     cp -R ./dist/linux-unpacked/* $installdir/$heroicdir/
-    ln -s $heroicdir/heroic $installdir/usr/bin/heroic
+    ln -s $heroicdir/heroic $installdir/usr/bin/heroic-run
     ln -s $heroicdir/resources/app.asar.unpacked/build/bin/linux/legendary $installdir/usr/bin/legendary
     ln -s $heroicdir/resources/app.asar.unpacked/build/bin/linux/gogdl $installdir/usr/bin/gogdl
 
     # Copy icon
-    install -Dm00644 ./dist/linux-unpacked/resources/app.asar.unpacked/build/icon.png $installdir/usr/share/icons/hicolor/512x512/apps/heroic.png
+    install -Dm00644 ./dist/linux-unpacked/resources/app.asar.unpacked/build/icon.png $installdir/usr/share/icons/hicolor/512x512/apps/com.heroicgameslauncher.hgl.png
 
     # Set up .desktop file
-    install -Dm00644 $pkgfiles/heroic.desktop $installdir/usr/share/applications/heroic.desktop
+    sed -i 's/StartupWMClass.*/StartupWMClass=heroic/' ./flatpak/com.heroicgameslauncher.hgl.desktop
+    install -Dm00644 ./flatpak/com.heroicgameslauncher.hgl.desktop -t $installdir/usr/share/applications
+
+    # Install appstream metadata
+    install -Dm00644 ./flatpak/templates/com.heroicgameslauncher.hgl.metainfo.xml.template $installdir/usr/share/metainfo/com.heroicgameslauncher.hgl.metainfo.xml
diff --git a/packages/h/heroic-games-launcher/pspec_x86_64.xml b/packages/h/heroic-games-launcher/pspec_x86_64.xml
index 434532837c6..f868bc6d2ea 100644
--- a/packages/h/heroic-games-launcher/pspec_x86_64.xml
+++ b/packages/h/heroic-games-launcher/pspec_x86_64.xml
@@ -1,10 +1,10 @@
 <PISI>
     <Source>
         <Name>heroic-games-launcher</Name>
-        <Homepage>https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher</Homepage>
+        <Homepage>https://heroicgameslauncher.com/</Homepage>
         <Packager>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>games</PartOf>
@@ -21,9 +21,9 @@
         <PartOf>games</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/gogdl</Path>
-            <Path fileType="executable">/usr/bin/heroic</Path>
+            <Path fileType="executable">/usr/bin/heroic-run</Path>
             <Path fileType="executable">/usr/bin/legendary</Path>
-            <Path fileType="data">/usr/share/applications/heroic.desktop</Path>
+            <Path fileType="data">/usr/share/applications/com.heroicgameslauncher.hgl.desktop</Path>
             <Path fileType="data">/usr/share/heroic/LICENSE.electron.txt</Path>
             <Path fileType="data">/usr/share/heroic/LICENSES.chromium.html</Path>
             <Path fileType="data">/usr/share/heroic/chrome-sandbox</Path>
@@ -120,16 +120,17 @@
             <Path fileType="data">/usr/share/heroic/snapshot_blob.bin</Path>
             <Path fileType="data">/usr/share/heroic/v8_context_snapshot.bin</Path>
             <Path fileType="data">/usr/share/heroic/vk_swiftshader_icd.json</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/heroic.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/com.heroicgameslauncher.hgl.png</Path>
+            <Path fileType="data">/usr/share/metainfo/com.heroicgameslauncher.hgl.metainfo.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="23">
-            <Date>2024-01-13</Date>
+        <Update release="24">
+            <Date>2024-01-24</Date>
             <Version>2.12.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file