diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml
index b4dc7a6ae7..068b658791 100644
--- a/.github/workflows/add-pr-labels.yml
+++ b/.github/workflows/add-pr-labels.yml
@@ -14,9 +14,5 @@ permissions:
 
 jobs:
   add-pr-label:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/add-pr-labels.yml@main
-=======
     uses: vyos/.github/.github/workflows/add-pr-labels.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml
index 92976672d1..1f69f48073 100644
--- a/.github/workflows/auto-author-assign.yml
+++ b/.github/workflows/auto-author-assign.yml
@@ -8,9 +8,5 @@ permissions:
 
 jobs:
   assign-author:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/assign-author.yml@main
-=======
     uses: vyos/.github/.github/workflows/assign-author.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/chceck-pr-message.yml b/.github/workflows/chceck-pr-message.yml
index 85d289e21f..95c5b69ce9 100644
--- a/.github/workflows/chceck-pr-message.yml
+++ b/.github/workflows/chceck-pr-message.yml
@@ -10,9 +10,5 @@ on:
 
 jobs:
   check-pr-title:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/check-pr-message.yml@main
-=======
     uses: vyos/.github/.github/workflows/check-pr-message.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index b091843484..62a37a7faa 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -9,9 +9,5 @@ permissions:
 
 jobs:
   check-pr-conflict-call:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@main
-=======
     uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-stale.yml b/.github/workflows/check-stale.yml
index f8db4598ea..60a3cf88fb 100644
--- a/.github/workflows/check-stale.yml
+++ b/.github/workflows/check-stale.yml
@@ -3,11 +3,10 @@ on:
   schedule:
   - cron: "0 0 * * *"
 
+permissions:
+  pull-requests: write
+
 jobs:
   stale:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/check-stale.yml@main
-=======
     uses: vyos/.github/.github/workflows/check-stale.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml
index df7f6b70f6..42e8be49b2 100644
--- a/.github/workflows/check-unused-imports.yml
+++ b/.github/workflows/check-unused-imports.yml
@@ -6,10 +6,6 @@ on:
       - sagitta
 
 jobs:
-  Check-Unused-Imports:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/check-unused-imports.yml@main
-=======
+  check-unused-imports:
     uses: vyos/.github/.github/workflows/check-unused-imports.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 441f93f0ff..f6472784d6 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -16,11 +16,7 @@ permissions:
 
 jobs:
   codeql-analysis-call:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/codeql-analysis.yml@main
-=======
     uses: vyos/.github/.github/workflows/codeql-analysis.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
     with:
       languages: "['python']"
diff --git a/.github/workflows/label-backport.yml b/.github/workflows/label-backport.yml
index 6c5f716097..d92acbec57 100644
--- a/.github/workflows/label-backport.yml
+++ b/.github/workflows/label-backport.yml
@@ -2,11 +2,10 @@ name: Mergifyio backport
 
 on: [issue_comment]
 
+permissions:
+    pull-requests: write
+
 jobs:
-  mergifyio_backport:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/label-backport.yml@main
-=======
+  mergifyio-backport:
     uses: vyos/.github/.github/workflows/label-backport.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit
diff --git a/.github/workflows/linit-j2.yml b/.github/workflows/linit-j2.yml
index 4f42153c32..093fe7ffed 100644
--- a/.github/workflows/linit-j2.yml
+++ b/.github/workflows/linit-j2.yml
@@ -10,9 +10,5 @@ on:
 
 jobs:
   j2lint:
-<<<<<<< HEAD
-    uses: vyos/.github/.github/workflows/lint-j2.yml@main
-=======
     uses: vyos/.github/.github/workflows/lint-j2.yml@feature/T6349-reusable-workflows
->>>>>>> 9a5897682a6d7fb59e2e90eb50b87dbbe8babaea
     secrets: inherit