diff --git a/.github/ISSUE_TEMPLATE/refactor.md b/.github/ISSUE_TEMPLATE/refactor.md
index 212994c..7df42ae 100644
--- a/.github/ISSUE_TEMPLATE/refactor.md
+++ b/.github/ISSUE_TEMPLATE/refactor.md
@@ -1,7 +1,7 @@
 ---
 name: Refactoring request
 about: Suggest a refactoring request of an existing feature or design
-title: "[REFACTORING] "
+title: "[REFACTOR] "
 labels: kind/refactoring
 assignees: ''
 
diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml
index 053c068..2c2f91e 100644
--- a/.github/workflows/close-issue.yml
+++ b/.github/workflows/close-issue.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   backport:
     runs-on: ubuntu-latest
-    if: contains(github.event.label.name, 'backport-needed')
+    if: contains(github.event.label.name, 'backport/')
     steps:
       - name: Get Backport Version
         uses: xom9ikk/split@v1
diff --git a/.github/workflows/create-issue.yml b/.github/workflows/create-issue.yml
index 7357954..f0075e3 100644
--- a/.github/workflows/create-issue.yml
+++ b/.github/workflows/create-issue.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   backport:
     runs-on: ubuntu-latest
-    if: contains(github.event.label.name, 'backport-needed')
+    if: contains(github.event.label.name, 'backport/')
     steps:
       - name: Get Backport Version
         uses: xom9ikk/split@v1
@@ -37,7 +37,7 @@ jobs:
           RAW_LABELS="${{ join(github.event.issue.labels.*.name, ' ') }}"
           RAW_LABELS="${RAW_LABELS} kind/backport"
           echo "RAW LABELS: $RAW_LABELS"
-          LABELS=$(echo "$RAW_LABELS" | sed -r 's/\s*backport-needed\S+//g' | sed -r 's/\s*require\/automation-e2e//g' | xargs | sed 's/ /, /g')
+          LABELS=$(echo "$RAW_LABELS" | sed -r 's/\s*backport\S+//g' | sed -r 's/\s*require\/automation-e2e//g' | xargs | sed 's/ /, /g')
           echo "LABELS: $LABELS"
           echo "::set-output name=labels::$LABELS"
       - name: Create Backport Issue