diff --git a/.github/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 68%
rename from .github/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 0e03cc45..dc3e818c 100644
--- a/.github/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug
+about: Reporte de bugs
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 # Bug
 
 ### Descrição
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..db848e7a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,13 @@
+---
+name: Nova funcionalidade
+about: Reporte de novas funcionalidades
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# Nova funcionalidade
+
+### Descrição
+Descreva detalhadamente a nova funcionalidade.
diff --git a/.github/pull_request_template/branches/master.md b/.github/PULL_REQUEST_TEMPLATE/master.md
similarity index 100%
rename from .github/pull_request_template/branches/master.md
rename to .github/PULL_REQUEST_TEMPLATE/master.md
diff --git a/.github/feature_request.md b/.github/feature_request.md
deleted file mode 100644
index 0ee79355..00000000
--- a/.github/feature_request.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Nova funcionalidade
-
-### Descrição
-Descreva detalhadamente a nova funcionalidade.
diff --git a/.github/pull_request_template/pull_request_template.md b/.github/pull_request_template.md
similarity index 100%
rename from .github/pull_request_template/pull_request_template.md
rename to .github/pull_request_template.md
diff --git a/.github/workflows/build_branch.yml b/.github/workflows/build_branch.yml
index b58b8be1..44682e30 100644
--- a/.github/workflows/build_branch.yml
+++ b/.github/workflows/build_branch.yml
@@ -24,10 +24,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  generate-branch-name:
+    runs-on: ubuntu-latest
+    outputs:
+      branch: ${{ steps.main_step.outputs.branch }}
+    steps:
+      - id: main_step
+        run: |
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
   call-workflow-cd:
+    needs:
+      - generate-branch-name
     uses: pagarme/woocommerce/.github/workflows/cd_reusable.yml@master
     with:
-      tag: ${{ GITHUB_REF#refs/heads/ }}
+      tag: ${{ needs.generate-branch-name.outputs.branch }}
       wordpress_image_version: ${{ inputs.wordpress_image_version }}
       woocommerce_version: ${{ inputs.woocommerce_version }}
       woocommerce_extra_checkout_fields_version: ${{ inputs.woocommerce_extra_checkout_fields_version }}