diff --git a/.gitlab/issue_templates/harjoitus-tehtava.md b/.gitlab/fi_issue_templates/harjoitus-tehtava.md
similarity index 100%
rename from .gitlab/issue_templates/harjoitus-tehtava.md
rename to .gitlab/fi_issue_templates/harjoitus-tehtava.md
diff --git a/.gitlab/issue_templates/kysymys-ja-vastaus.md b/.gitlab/fi_issue_templates/kysymys-ja-vastaus.md
similarity index 100%
rename from .gitlab/issue_templates/kysymys-ja-vastaus.md
rename to .gitlab/fi_issue_templates/kysymys-ja-vastaus.md
diff --git a/.gitlab/issue_templates/poikkeama-raportti.md b/.gitlab/fi_issue_templates/poikkeama-raportti.md
similarity index 100%
rename from .gitlab/issue_templates/poikkeama-raportti.md
rename to .gitlab/fi_issue_templates/poikkeama-raportti.md
diff --git "a/.gitlab/issue_templates/suunnittelu-teht\303\244v\303\244.md" "b/.gitlab/fi_issue_templates/suunnittelu-teht\303\244v\303\244.md"
similarity index 100%
rename from ".gitlab/issue_templates/suunnittelu-teht\303\244v\303\244.md"
rename to ".gitlab/fi_issue_templates/suunnittelu-teht\303\244v\303\244.md"
diff --git "a/.gitlab/issue_templates/toteutus-teht\303\244v\303\244.md" "b/.gitlab/fi_issue_templates/toteutus-teht\303\244v\303\244.md"
similarity index 100%
rename from ".gitlab/issue_templates/toteutus-teht\303\244v\303\244.md"
rename to ".gitlab/fi_issue_templates/toteutus-teht\303\244v\303\244.md"
diff --git a/.gitlab/issue_templates/vika-raportti.md b/.gitlab/fi_issue_templates/vika-raportti.md
similarity index 100%
rename from .gitlab/issue_templates/vika-raportti.md
rename to .gitlab/fi_issue_templates/vika-raportti.md
diff --git "a/.gitlab/issue_templates/yleinen-teht\303\244v\303\244.md" "b/.gitlab/fi_issue_templates/yleinen-teht\303\244v\303\244.md"
similarity index 100%
rename from ".gitlab/issue_templates/yleinen-teht\303\244v\303\244.md"
rename to ".gitlab/fi_issue_templates/yleinen-teht\303\244v\303\244.md"
diff --git a/.gitlab/issue_templates/documentation-task.md b/.gitlab/issue_templates/documentation.md
similarity index 100%
rename from .gitlab/issue_templates/documentation-task.md
rename to .gitlab/issue_templates/documentation.md
diff --git a/.gitlab/issue_templates/theme.md b/.gitlab/issue_templates/epic.md
similarity index 100%
rename from .gitlab/issue_templates/theme.md
rename to .gitlab/issue_templates/epic.md
diff --git a/.gitlab/issue_templates/general-task.md b/.gitlab/issue_templates/general.md
similarity index 100%
rename from .gitlab/issue_templates/general-task.md
rename to .gitlab/issue_templates/general.md
diff --git a/.gitlab/issue_templates/implementation-task.md b/.gitlab/issue_templates/implementation.md
similarity index 100%
rename from .gitlab/issue_templates/implementation-task.md
rename to .gitlab/issue_templates/implementation.md