diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index a9871932..0fee9809 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
 
-  Job1_-_Building_P1:
+  Building_flatpak:
     runs-on: self-hosted
     steps:
 
@@ -32,28 +32,20 @@ jobs:
       
       - uses: actions/checkout@v3
 
-      - name: Download global cache
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: cooker.yml
-          name: global-cache
-          search_artifacts: true
-          skip_unpack: true
-        continue-on-error: true
+      # - name: Download global cache
+      #   uses: dawidd6/action-download-artifact@v2
+      #   with:
+      #     workflow: cooker.yml
+      #     name: global-cache
+      #     search_artifacts: true
+      #     skip_unpack: true
+      #   continue-on-error: true
 
-      - name: Extract global cache
-        run: |
-          tar --skip-old-files -xzvf retrodeck-cooker.tar.gz
-          rm -f retrodeck-cooker.tar.gz
-        continue-on-error: true
-
-      - name: DEBUG
-        run: |
-          echo "Listing folder $PWD contents"
-          ls -lna
-          echo "Checking for version file"
-          find ~ -iname version
-          cat $(find ~ -iname version)
+      # - name: Extract global cache
+      #   run: |
+      #     tar --skip-old-files -xzvf retrodeck-cooker.tar.gz
+      #     rm -f retrodeck-cooker.tar.gz
+      #   continue-on-error: true
 
       - name: Initialize enviornment
         run: |
@@ -66,77 +58,72 @@ jobs:
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
 
-      - name: Buld part 1 - Until melonds
+      - name: Build flatpak
         run: |
-          sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          sudo flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
-      - name: Compress cache
-        run: |
-          touch retrodeck-cooker.tar.gz
-          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
-          find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
-          tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
+      # - name: Compress cache
+      #   run: |
+      #     touch retrodeck-cooker.tar.gz
+      #     rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
+      #     find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
+      #     tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
 
-      - name: Upload build specific cache
-        uses: actions/upload-artifact@v3
-        with:
-          name: "${{ steps.generating_buildid.outputs.build-id }}"
-          path: retrodeck-cooker.tar.gz
+      # - name: Upload build specific cache
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: "${{ steps.generating_buildid.outputs.build-id }}"
+      #     path: retrodeck-cooker.tar.gz
 
       # this is done to speed up the things now, it may be removed later
-      - name: Compress global cache
-        run: |
-          touch retrodeck-cooker.tar.gz
-          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
-          find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
-          tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
-        continue-on-error: true
+      # - name: Compress global cache
+      #   run: |
+      #     touch retrodeck-cooker.tar.gz
+      #     rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
+      #     find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
+      #     tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
+      #   continue-on-error: true
 
-      - name: Upload global cache
-        uses: actions/upload-artifact@v3
-        with:
-          name: global-cache
-          path: retrodeck-cooker.tar.gz RetroDECK.flatpak
-        continue-on-error: true
+      # - name: Upload global cache
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: global-cache
+      #     path: retrodeck-cooker.tar.gz RetroDECK.flatpak
+      #   continue-on-error: true
 
-    outputs:
-      buildID: "${{ steps.generating_buildid.outputs.build-id }}"
+    # outputs:
+    #   buildID: "${{ steps.generating_buildid.outputs.build-id }}"
 
-  Job2_-_Build_P2_and_publish:
-    runs-on: ubuntu-latest
-    needs: [Job1_-_Building_P1]
-    steps:
+      # - uses: actions/checkout@v3
 
-      - uses: actions/checkout@v3
-
-      - name: Download build specific cache
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ needs.Job1_-_Building_P1.outputs.buildID }}
+      # - name: Download build specific cache
+      #   uses: actions/download-artifact@v2
+      #   with:
+      #     name: ${{ needs.Job1_-_Building_P1.outputs.buildID }}
       
-      - name: Extract cache
-        run: |
-          tar --skip-old-files -xzvf retrodeck-cooker.tar.gz
-          rm -f retrodeck-cooker.tar.gz
+      # - name: Extract cache
+      #   run: |
+      #     tar --skip-old-files -xzvf retrodeck-cooker.tar.gz
+      #     rm -f retrodeck-cooker.tar.gz
 
-      - name: DEBUG
-        run: |
-          echo "Listing folder $PWD contents"
-          ls -lna
-          echo "Checking for version file"
-          find ~ -iname version
-          cat $(find ~ -iname version)
+      # - name: DEBUG
+      #   run: |
+      #     echo "Listing folder $PWD contents"
+      #     ls -lna
+      #     echo "Checking for version file"
+      #     find ~ -iname version
+      #     cat $(find ~ -iname version)
 
-      - name: Initialize enviornment
-        run: |
-          git pull
-          git submodule init
-          git submodule update
-          sudo add-apt-repository ppa:alexlarsson/flatpak
-          sudo apt-get update
-          sudo apt install flatpak flatpak-builder p7zip-full
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+      # - name: Initialize enviornment
+      #   run: |
+      #     git pull
+      #     git submodule init
+      #     git submodule update
+      #     sudo add-apt-repository ppa:alexlarsson/flatpak
+      #     sudo apt-get update
+      #     sudo apt install flatpak flatpak-builder p7zip-full
+      #     sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      #     sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
 
       - name: Create Bundle
         run: |
@@ -156,17 +143,17 @@ jobs:
         id: version
         run: echo "##[set-output name=version;]$(cat $(find . -name version))"
 
-      - name: DEBUG - Print version name
-        shell: bash
-        run: |
-          echo "DEBUG: printing version from version file"
-          echo "${{ steps.version.outputs.version }}"
+      # - name: DEBUG - Print version name
+      #   shell: bash
+      #   run: |
+      #     echo "DEBUG: printing version from version file"
+      #     echo "${{ steps.version.outputs.version }}"
 
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
           #tag: "${{ steps.version.outputs.version }}"
-          tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}"
+          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}}.
@@ -182,20 +169,20 @@ jobs:
           repo: RetroDECK-cooker
         continue-on-error: true
 
-      - name: Compress global cache
-        run: |
-          touch retrodeck-cooker.tar.gz
-          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
-          find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
-          tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
-        continue-on-error: true
+      # - name: Compress global cache
+      #   run: |
+      #     touch retrodeck-cooker.tar.gz
+      #     rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
+      #     find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks
+      #     tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build
+      #   continue-on-error: true
 
-      - name: Upload global cache
-        uses: actions/upload-artifact@v3
-        with:
-          name: global-cache
-          path: retrodeck-cooker.tar.gz RetroDECK.flatpak
-        continue-on-error: true
+      # - name: Upload global cache
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: global-cache
+      #     path: retrodeck-cooker.tar.gz RetroDECK.flatpak
+      #   continue-on-error: true
 
       - name: Upload RetroDECK.flatpak
         uses: actions/upload-artifact@v3