10 files changed, 29 insertions, 36 deletions
diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml
index ffb04f33b..24e8cc043 100644
--- a/.github/workflows/add-pr-labels.yml
+++ b/.github/workflows/add-pr-labels.yml
@@ -4,8 +4,6 @@ name: Add pull request labels
 on:
   pull_request_target:
     branches:
-      - current
-      - equuleus
       - sagitta
 
 permissions:
@@ -14,5 +12,5 @@ permissions:
 
 jobs:
   add-pr-label:
-    uses: vyos/.github/.github/workflows/add-pr-labels.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/add-pr-labels.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml
index c3696ea47..0e65d4b59 100644
--- a/.github/workflows/auto-author-assign.yml
+++ b/.github/workflows/auto-author-assign.yml
@@ -3,12 +3,11 @@ on:
   pull_request_target:
     types: [opened, reopened, ready_for_review, locked]
 
-
 permissions:
   pull-requests: write
   contents: read
 
 jobs:
   assign-author:
-    uses: vyos/.github/.github/workflows/assign-author.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/assign-author.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/chceck-pr-message.yml b/.github/workflows/chceck-pr-message.yml
index b39b3724d..db050a6e5 100644
--- a/.github/workflows/chceck-pr-message.yml
+++ b/.github/workflows/chceck-pr-message.yml
@@ -4,9 +4,7 @@ name: Check pull request message format
 on:
   pull_request_target:
     branches:
-      - current
       - sagitta
-      - equuleus
     types: [opened, synchronize, edited]
 
 permissions:
@@ -15,5 +13,5 @@ permissions:
 
 jobs:
   check-pr-title:
-    uses: vyos/.github/.github/workflows/check-pr-message.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/check-pr-message.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 0c659e6ed..8a8e64c21 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
 
 jobs:
   check-pr-conflict-call:
-    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/check-stale.yml b/.github/workflows/check-stale.yml
index 59d25a11b..11f440bbd 100644
--- a/.github/workflows/check-stale.yml
+++ b/.github/workflows/check-stale.yml
@@ -10,5 +10,5 @@ permissions:
 
 jobs:
   stale:
-    uses: vyos/.github/.github/workflows/check-stale.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/check-stale.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml
index 324a63e90..eccabc831 100644
--- a/.github/workflows/check-unused-imports.yml
+++ b/.github/workflows/check-unused-imports.yml
@@ -2,9 +2,7 @@ name: Check for unused imports using Pylint
 on:
   pull_request:
     branches:
-      - current
       - sagitta
-      - equuleus
   workflow_dispatch:
 
 permissions:
@@ -12,5 +10,5 @@ permissions:
 
 jobs:
   check-unused-imports:
-    uses: vyos/.github/.github/workflows/check-unused-imports.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/check-unused-imports.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a4fc39e26..665cdda01 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,12 @@ name: "Perform CodeQL Analysis"
 
 on:
   push:
-    branches: [ "current", "sagitta", "equuleus" ]
+    branches:
+      - sagitta
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "current" ]
+    branches:
+      - sagitta
   schedule:
     - cron: '22 10 * * 0'
   workflow_dispatch:
@@ -17,7 +19,7 @@ permissions:
 
 jobs:
   codeql-analysis-call:
-    uses: vyos/.github/.github/workflows/codeql-analysis.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/codeql-analysis.yml@sagitta
     secrets: inherit
     with:
       languages: "['python']"
diff --git a/.github/workflows/label-backport.yml b/.github/workflows/label-backport.yml
index 9192b8184..900155e7e 100644
--- a/.github/workflows/label-backport.yml
+++ b/.github/workflows/label-backport.yml
@@ -8,5 +8,5 @@ permissions:
 
 jobs:
   mergifyio-backport:
-    uses: vyos/.github/.github/workflows/label-backport.yml@feature/T6349-reusable-workflows
+    uses: vyos/.github/.github/workflows/label-backport.yml@sagitta
     secrets: inherit
diff --git a/.github/workflows/linit-j2.yml b/.github/workflows/linit-j2.yml
deleted file mode 100644
index 95bfa61f0..000000000
--- a/.github/workflows/linit-j2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: J2 Lint
-
-on:
-  pull_request:
-    branches:
-      - current
-      - sagitta
-      - equuleus
-  workflow_dispatch:
-
-permissions:
-  pull-requests: write
-  contents: read
-
-jobs:
-  j2lint:
-    uses: vyos/.github/.github/workflows/lint-j2.yml@feature/T6349-reusable-workflows
-    secrets: inherit
diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml
new file mode 100644
index 000000000..b475a84ec
--- /dev/null
+++ b/.github/workflows/repo-sync.yml
@@ -0,0 +1,17 @@
+name: Repo-sync
+
+on:
+    pull_request_target:
+      types:
+        - closed
+      branches:
+        - sagitta
+    workflow_dispatch:
+
+jobs:
+  trigger-sync:
+    uses: vyos/.github/.github/workflows/trigger-repo-sync.yml@sagitta
+    secrets:
+      REMOTE_REPO: ${{ secrets.REMOTE_REPO }}
+      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
+      PAT: ${{ secrets.PAT }}