diff --git a/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
similarity index 100%
rename from workflows/build-artifacts.yml
rename to .github/workflows/build-artifacts.yml
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
deleted file mode 100644
index 8d355ca..0000000
--- a/.github/workflows/build_artifacts.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: "Build PPSSPP Artifacts for RetroDECK"
-
-on:
-  push:
-    branches:
-     - master
-  workflow_dispatch:
-
-
-jobs:
-
-  Building_RetroDECK-PPSSPP:
-    runs-on: ubuntu-latest
-    steps:
-
-      # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
-      # - name: Remove stuck mounts
-      #   run: sudo umount -f /home/ubuntu/ppsspp-runner/_work/RetroDECK-PPSSPP/RetroDECK-PPSSPP/.flatpak-builder/rofiles/*
-      #   continue-on-error: true
-    
-      - name: Clone repo
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-
-      - name: "Install dependencies"
-        run: "automation_tools/install_dependencies.sh"
-
-      # - name: "Creating PPSSPP manifest"
-      #   run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/update_ppsspp_manifest.sh"
-
-      # - name: "[DEBUG] Outputting manifest"
-      #   run: cat net.retrodeck.ppsspp.yml
-
-      - name: "Build flatpak"
-        id: "flatpak-download"
-        run: |
-          git config --global protocol.file.allow always
-          flatpak-builder --user --force-clean \
-            --install-deps-from=flathub \
-            --install-deps-from=flathub-beta \
-            --repo=${GITHUB_WORKSPACE}/ppsspp-repo \
-            "${GITHUB_WORKSPACE}"/ppsspp-build-dir \
-            org.ppsspp.PPSSPP.yml
-
-      - name: "Exporting dir tree"
-        id: tree
-        run: tree -H ./ > ${GITHUB_WORKSPACE}/tree.html
-
-      - name: Create Artifact for RetroDECK
-        run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-PPSSPP-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/ppsspp-build-dir .
-          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-PPSSPP-Artifact.tar.gz))
-          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
-          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
-        continue-on-error: true
-        timeout-minutes: 1440
-
-      - name: Set environment variable with current branch name
-        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
-
-      - name: Get branch name
-        id: branch_name
-        run: echo "BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')" >> $GITHUB_ENV
-
-      - name: Get date
-        id: date
-        run: echo "DATE=$(date +'%d%m%y.%S')" >> $GITHUB_ENV
-
-      - name: Publish the artifacts in a new release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: "${{env.BRANCH_NAME}}-${{env.DATE}}"
-          body: |
-            # Release Notes
-            These are the artifact of RetroDECK PPSSPP, commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-            On branch [${{env.BRANCH_NAME}}](https://github.com/XargonWan/RetroDECK-PPSSPP/tree/${{env.BRANCH_NAME}}).
-
-          artifacts: "RetroDECK-PPSSPP-Artifact.tar.gz, tree.html"
-          allowUpdates: true
-          makeLatest: true
-          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-        continue-on-error: true
-
-      # - name: "Committing changes"
-      #   with: 
-      #     github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-      #   run: |
-      #     git config user.name "GitHub Actions"
-      #     git config user.email "actions@github.com"
-      #     git add * net.retrodeck.ppsspp.yml
-      #     git commit -m '[AUTOMATED] Updating PPSSPP after build [skip ci]'
-      #     git push origin main
-      #   continue-on-error: true # TODO: would be good to update the manifest but it's broken
-
-      # - name: GitHub Commit & Push
-      #   uses: actions-js/push@v1.4
-      #   with: 
-      #     github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-      #     message: '[AUTOMATED] Updating PPSSPP after build [skip ci]'
-      #     branch: retrodeck-main
-      #   continue-on-error: true # TODO: would be good to update the manifest but it's broken
\ No newline at end of file
diff --git a/workflows/pr-from-upstream.yml b/.github/workflows/pr-from-upstream.yml
similarity index 100%
rename from workflows/pr-from-upstream.yml
rename to .github/workflows/pr-from-upstream.yml