diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
new file mode 100644
index 00000000..82b57ad2
--- /dev/null
+++ b/.github/workflows/flathub_push_main.yml
@@ -0,0 +1,84 @@
+
+name: PUSH-main-flathub
+
+on:
+  workflow_dispatch:
+
+jobs:
+
+  Pushing_main_into_flathub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Pushing
+        shell: bash
+        run: |
+
+          # EDITABLES:
+          rd_branch=${GITHUB_REF_NAME} # should be main
+          echo $rd_branch
+          gits_folder="${GITHUB_WORKSPACE}/gits" # without last /
+
+          mkdir -vp $gits_folder
+          cd $gits_folder
+          if [ -d flathub ]; then
+            rm -rf flathub
+          fi
+          git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub
+          cd $gits_folder
+          git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK
+          cd $gits_folder/RetroDECK
+
+          git checkout $rd_branch
+          git submodule init
+          git submodule update
+          # NOTE: the only linked submodules are: rd-submodules/retroarch
+          # these must be included in the exclusion list as they must be redownloaded
+          #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
+
+          cd $gits_folder/flathub
+
+          git checkout master
+
+          git rm -rf *
+          git clean -fxd # restroing git index
+
+          # Copying only a few files as the others are cloned by git in retrodeck.sh
+          cd $gits_folder/RetroDECK
+          cp -rf \
+          'flathub.json' \
+          'LICENSE' \
+          'flathub.yml' \
+          'README.md' \
+          $gits_folder/flathub/
+
+          cd $gits_folder/flathub
+          ls -lah
+
+          # manipulating manifest
+          mv flathub.yml net.retrodeck.retrodeck.yml
+
+          # Getting latest release name
+          # version=$(\
+          # curl -sL \
+          # -H "Accept: application/vnd.github+json" \
+          # -H "Authorization: Bearer ${{ secrets.TRIGGER_BUILD_TOKEN }}" \
+          # https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases \
+          # | jq .[0].tag_name \
+          # | tr -d \" \
+          # )
+
+          sha=$(curl -sL https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.sha)
+
+          sed -i "s#__SHA__#$sha#g" net.retrodeck.retrodeck.yml
+
+          echo -e "Resulting manifest:\n"
+          cat net.retrodeck.retrodeck.yml
+
+          git config --global user.name "${{ secrets.GITNAME }}"
+          git config --global user.email "${{ secrets.GITMAIL }}"
+
+          git add *
+          git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch"
+
+          git remote -v
+          git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master
diff --git a/.github/workflows/temp-upload-on-server.yml b/.github/workflows/temp-upload-on-server.yml
deleted file mode 100644
index 9711a11a..00000000
--- a/.github/workflows/temp-upload-on-server.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-name: server-upload
-
-on:
-
-  workflow_dispatch:
-
-
-jobs:
-
-  Building_RetroDECK:
-    runs-on: self-hosted
-    steps:
-    
-      - name: Home Test
-        run: touch $HOME/retrodeck-test
-
-      - name: Remove stuck mounts
-        run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-        continue-on-error: true
-
-      - name: Get date for artifacts
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')"
-
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: extract_branch
-
-      - name: Generate build ID
-        id: generating_buildid
-        #run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")"
-        run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")"
-      
-      - uses: actions/checkout@v3
-
-      - name: Initialize enviornment
-        run: |
-          git pull
-          git submodule init
-          git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full
-          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install --user -y --noninteractive \
-          org.kde.Sdk//6.3 \
-          org.kde.Platform//6.3 \
-          org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 \
-          io.qt.qtwebengine.BaseApp/x86_64/6.3 \
-          org.freedesktop.Sdk.Extension.llvm13 \
-          org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08
-
-      - name: Build flatpak
-        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
-          cp RetroDECK-Artifact.* $HOME
-
-      - name: Create Bundle
-        run: |
-          flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
-
-      - name: Publish the flatpak in a new cooker release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
-          body: |
-            # Release Notes (Cooker)
-            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-      
-            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,RetroDECK-Artifact.tar.gz"
-          allowUpdates: true
-          prerelease: true
-          draft: false
-          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-          repo: RetroDECK-cooker
-        continue-on-error: true
-
-      # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
-      - name: Upload RetroDECK.flatpak
-        uses: actions/upload-artifact@v3
-        with:
-          name: retrodeck-flatpak
-          path: RetroDECK.flatpak
-        continue-on-error: true
-
-      - name: Upload RetroDECK-Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: retrodeck-artifact
-          path: RetroDECK-Artifact.tar.gz
-        continue-on-error: true