3 files changed, 13 insertions, 40 deletions
diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml
deleted file mode 100644
index a62e44b24..000000000
--- a/.github/workflows/cleanup-mirror-pr-branch.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Cleanup pr mirror branch
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-        - current
-
-permissions:
-  contents: write
-
-jobs:
-  call-delete-branch:
-    if: github.repository_owner != 'vyos'
-    uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current
-    secrets: inherit
diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml
deleted file mode 100644
index 120e116d4..000000000
--- a/.github/workflows/mirror-pr-and-sync.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Create Mirror PR and Repo Sync
-on:
-  workflow_dispatch:
-    inputs:
-      sync_branch:
-        description: 'branch to sync'
-        required: true
-        type: string
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  call-mirror-pr-and-sync:
-    if: github.repository_owner != 'vyos'
-    uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main
-    with:
-      sync_branch: ${{ inputs.sync_branch }}
-    secrets:
-      PAT: ${{ secrets.PAT }}
diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml
index e136881b8..7f0012d18 100644
--- a/.github/workflows/pr-mirror-repo-sync.yml
+++ b/.github/workflows/pr-mirror-repo-sync.yml
@@ -5,14 +5,24 @@ on:
         - closed
       branches:
         - current
-
+  workflow_dispatch:
+    inputs:
+      sync_branch:
+        description: 'branch to sync'
+        required: false
+        type: string
+        default: 'current'
 permissions:
   pull-requests: write
   contents: write
   issues: write
-
 jobs:
   call-trigger-mirror-pr-repo-sync:
     if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true
     uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current
-    secrets: inherit
+    with:
+      sync_branch: ${{ inputs.sync_branch }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
+      REMOTE_REPO: ${{ secrets.REMOTE_REPO }}