diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 979d214a..332113d0 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -56,11 +56,8 @@ jobs:
       - name: Run pre-build automation tasks
         run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
 
-      # remove me when the automations tool substitution can do this
-      # - name: Set branch in the manifest
-      #   run: |
-      #     sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
-      #     echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"
+      - name: "Adding flatpak portal for automated updates (cooker only)"
+        run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml
 
       - name: "Build flatpak: download only"
         id: "flatpak-download"
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 87152095..00a1b70c 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -45,12 +45,6 @@ jobs:
       - name: Run pre-build automation tasks
         run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
 
-      # remove me when the automations tool substitution can do this
-      # - name: Set branch in the manifest
-      #   run: |
-      #     sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
-      #     echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"
-
       - name: Read manifest content
         id: read_manifest
         run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)"