diff --git a/.github/ISSUE_TEMPLATE/bug_fix.md b/.github/ISSUE_TEMPLATE/bug_fix.md
deleted file mode 100644
index 7d6c290a0..000000000
--- a/.github/ISSUE_TEMPLATE/bug_fix.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-*******************************************************************************
-Copyright (c) 2026 Contributors to the Eclipse Foundation
-
-See the NOTICE file(s) distributed with this work for additional
-information regarding copyright ownership.
-
-This program and the accompanying materials are made available under the
-terms of the Apache License Version 2.0 which is available at
-https://www.apache.org/licenses/LICENSE-2.0
-
-SPDX-License-Identifier: Apache-2.0
-*******************************************************************************
--->
-
----
-name: Bugfix
-about: 'Issue to track a bugfix'
-title: 'Bugfix: Your bugfix title'
-labels: 'codeowner_review'
-assignees: ''
-
----
-
-> [!IMPORTANT]
-> Make sure to link this issue with the PR for your bugfix.
diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
deleted file mode 100644
index 769b0e7db..000000000
--- a/.github/ISSUE_TEMPLATE/improvement.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-*******************************************************************************
-Copyright (c) 2026 Contributors to the Eclipse Foundation
-
-See the NOTICE file(s) distributed with this work for additional
-information regarding copyright ownership.
-
-This program and the accompanying materials are made available under the
-terms of the Apache License Version 2.0 which is available at
-https://www.apache.org/licenses/LICENSE-2.0
-
-SPDX-License-Identifier: Apache-2.0
-*******************************************************************************
--->
-
----
-name: Improvement
-about: 'Issue to track a improvement'
-title: 'Improvement: Your improvement title'
-labels: 'codeowner_review'
-assignees: ''
-
----
-
-> [!IMPORTANT]
-> Make sure to link this issue with the PR for your improvement.
diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
index d3389a3c6..5c05cd40c 100644
--- a/CONTRIBUTION.md
+++ b/CONTRIBUTION.md
@@ -35,8 +35,8 @@ This phase is part of the eclipse Incubation Phase and shall establish all the p
 #### Bug Fixes and Improvements
 Improvements are adding/changing processes and infrastructure, bug fixes can be also on development work products like code.
 In case you want to fix a bug or contribute an improvement, please perform the following steps:
-1) Create a PR that describes the bug fix or improvement. Please mark your PR as draft until it's ready for review by the Committers (see the [Eclipse Foundation Project Handbook](https://www.eclipse.org/projects/handbook/#contributing-committers) for more information on the role definitions). Improvements are requested by the definition or modification of [Stakeholder Requirements](docs/stakeholder_requirements) or [Tool Requirements](docs/tool_requirements) and may be implemented after acceptance/merge of the request by a second Improvement PR. The needed reviews are automatically triggered via the [CODEOWNERS](.github/CODEOWNERS) file in the repository.
-2) Initiate content review by opening a corresponding issue for the PR when it is ready for review. Review of the PR and final merge into the project repository is in responsibility of the Committers. Use the [Bugfix Issue template](.github/ISSUE_TEMPLATE/bug_fix.md) or [Improvement Issue template](.github/ISSUE_TEMPLATE/improvement.md) for this.
+1) Create a PR by using the corresponding template ([Bugfix PR template](.github/PULL_REQUEST_TEMPLATE/bug_fix.md) or [Improvement PR template](.github/PULL_REQUEST_TEMPLATE/improvement.md)). Please mark your PR as draft until it's ready for review by the Committers (see the [Eclipse Foundation Project Handbook](https://www.eclipse.org/projects/handbook/#contributing-committers) for more information on the role definitions). Improvements are requested by the definition or modification of [Stakeholder Requirements](docs/stakeholder_requirements) or [Tool Requirements](docs/tool_requirements) and may be implemented after acceptance/merge of the request by a second Improvement PR. The needed reviews are automatically triggered via the [CODEOWNERS](.github/CODEOWNERS) file in the repository.
+2) Initiate content review by opening a corresponding issue for the PR when it is ready for review. Review of the PR and final merge into the project repository is in responsibility of the Committers. Use the corresponding issue form of the [eclipse-score organisation](https://github.com/eclipse-score/.github/tree/main/.github/ISSUE_TEMPLATE) for this (*Bug* for bug fixes, *Task* for improvements), offered under *Issues → New issue*.
 
 Please check here for our Git Commit Rules in the [Configuration_Tool_Guidelines](https://eclipse-score.github.io/score/process_description/guidelines/index.html).