diff --git a/.github/workflows/auto-merge.release-v0.4.0.yaml b/.github/workflows/auto-merge.release-v0.4.0.yaml
new file mode 100644
index 00000000..45c909be
--- /dev/null
+++ b/.github/workflows/auto-merge.release-v0.4.0.yaml
@@ -0,0 +1,39 @@
+name: auto-merge-release-v0.4.0
+
+on:
+  workflow_dispatch: {}
+  schedule:
+  - cron: "*/30 * * * *" # At every 30 minutes
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
+    permissions:
+      pull-requests: write
+    steps:
+    - name: Checkout the current repo
+      uses: actions/checkout@v4
+    - name: auto-merge-update-references
+      run: |
+        gh auth status
+        git config user.name openshift-pipelines-bot
+        git config user.email pipelines-extcomm@redhat.com
+        # Approve and merge pull-request with no reviews
+        for p in $(gh pr list --search "author:app/red-hat-konflux head:konflux/references/release-v0.4.0" --json "number" | jq ".[].number"); do
+          gh pr merge --rebase --delete-branch --auto $p
+        done
+      env:
+        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
+    - name: auto-merge-upstream-release-v0.4.0
+      run: |
+        gh auth status
+        git config user.name openshift-pipelines-bot
+        git config user.email pipelines-extcomm@redhat.com
+        # Approve and merge pull-request with no reviews
+        for p in $(gh pr list --search "head:actions/update/sources-release-v0.4.0" --json "number" | jq ".[].number"); do
+          gh pr merge --rebase --delete-branch --auto $p
+        done
+      env:
+        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
+
diff --git a/.konflux/next/component-controller.yaml b/.konflux/next/component-controller.yaml
index 85e5fa72..bc244883 100644
--- a/.konflux/next/component-controller.yaml
+++ b/.konflux/next/component-controller.yaml
@@ -15,4 +15,4 @@ spec:
     git:
       url: https://github.com/openshift-pipelines/manual-approval-gate
       dockerfileUrl: .konflux/dockerfiles/controller.Dockerfile
-      revision: next
+      revision: release-v0.4.0
diff --git a/.konflux/next/component-webhook.yaml b/.konflux/next/component-webhook.yaml
index f9e812fd..ede08330 100644
--- a/.konflux/next/component-webhook.yaml
+++ b/.konflux/next/component-webhook.yaml
@@ -15,4 +15,4 @@ spec:
     git:
       url: https://github.com/openshift-pipelines/manual-approval-gate
       dockerfileUrl: .konflux/dockerfiles/webhook.Dockerfile
-      revision: next
+      revision: release-v0.4.0