diff --git a/.github/ISSUE_TEMPLATE/test_infra.md b/.github/ISSUE_TEMPLATE/infra.md
similarity index 74%
rename from .github/ISSUE_TEMPLATE/test_infra.md
rename to .github/ISSUE_TEMPLATE/infra.md
index 4a5473e..e715bb1 100644
--- a/.github/ISSUE_TEMPLATE/test_infra.md
+++ b/.github/ISSUE_TEMPLATE/infra.md
@@ -1,15 +1,15 @@
 ---
-name: Test infra
-about: Create a test-infra task
-title: "[TEST-INFRA] "
-labels: kind/test
+name: Infra
+about: Create an test/dev infra task
+title: "[INFRA] "
+labels: kind/infra
 assignees: ''
 
 ---
 
 ## What's the test to develop? Please describe
 
-A clear and concise description of what the test infra you want to develop.
+A clear and concise description of what test/dev infra you want to develop.
 
 ## Describe the items of the test development (DoD, definition of done) you'd like
 > Please use a task list for items on a separate line with a clickable checkbox https://docs.github.com/en/issues/tracking-your-work-with-issues/about-task-lists