diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index d3f7729e..cbbddf1f 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -55,10 +55,15 @@ jobs:
         run: |
           flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
+      - name: Create Artifact for flathub
+        run: | 
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
+          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
+
       - name: Create Bundle
         run: |
-          flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
-          flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
+          flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
       - name: Read version from version file
         id: version
@@ -76,7 +81,7 @@ jobs:
             Cooker channel is provided for the community to test fixes and explore new functionality.
             Please DO NOT open issues or ask support on this build.
 
-          artifacts: "RetroDECK.flatpak"
+          artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
           prerelease: true
           draft: false
@@ -90,4 +95,4 @@ jobs:
         with:
           name: retrodeck-flatpak
           path: RetroDECK.flatpak
-        continue-on-error: true
+        continue-on-error: true
\ No newline at end of file
diff --git a/flathub.yml b/flathub.yml
new file mode 100644
index 00000000..827906ca
--- /dev/null
+++ b/flathub.yml
@@ -0,0 +1,48 @@
+app-id: net.retrodeck.retrodeck
+runtime: org.kde.Platform
+runtime-version: 5.15-21.08
+#runtime-version: 6.3                        # bumped because of pcsx2-qt
+sdk: org.kde.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
+  - org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx
+base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
+base-version: 5.15-21.08                    # Needed for Yuzu
+command: retrodeck.sh
+
+finish-args:
+  - --socket=x11
+  - --socket=wayland
+  - --socket=pulseaudio
+  - --share=ipc
+  - --share=network
+  - --device=all
+  - --filesystem=~/retrodeck:create
+  - --filesystem=/run/media
+  - --filesystem=/media
+  - --allow=multiarch
+  - --talk-name=org.freedesktop.ScreenSaver
+  - --talk-name=org.freedesktop.PowerManagement.Inhibit
+  - --talk-name=org.freedesktop.login1
+  - --filesystem=xdg-run/app/com.discordapp.Discord:create
+  # Yuzu
+  # - --filesystem=home:ro # This may break Yuzu, let's see
+  # - --filesystem=/run/media:ro
+  # Dolphin
+  - --allow=bluetooth
+  #- --env=QT_QPA_PLATFORM=xcb #not sure if this will break something
+  # rpcs3
+  - --socket=fallback-x11
+
+modules:
+  - name: retrodeck
+    buildsystem: simple
+    build-commands:
+      - cp -rn files/* /app
+    sources:
+    - type: archive
+      url: https://github.com/XargonWan/RetroDECK-cooker/releases/download/__VERSION__/RetroDECK-Artifact.tar.gz
+      sha256:  __SHA__
+
+# seddare version e sha
+# modificare il wf flathub-push mettendo le credential e il flathub.yml modificato
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index a9fa98cd..842d384c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -67,6 +67,7 @@ modules:
   # [ ] Update the VERSION variable
   # [ ] Update the appdata.xml with the version number and notes
   # [ ] change branch into main in retrodeck module (last one)
+  # [ ] if header (before modules) was edited, edit it even in flathub.yml
   # [ ] change the screenshots link from cooker to main
   #
   - name: version-initialization