diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f41971d..5694afe 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,6 +7,16 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report! Briefly describe the issue you're experiencing. Tell us what you were trying to do and what happened instead. Remember, this is not a place to ask for help debugging code. For that, we welcome you in the OpenZeppelin Community Forum: https://forum.openzeppelin.com/.
+  - type: checkboxes
+    id: templates
+    attributes:
+      label: templates
+      description: Which template is this issue related to?
+      options:
+        - label: Generic Runtime Template
+          required: false
+        - label: Evm Template
+          required: false
   - type: textarea
     id: what-happened
     attributes:
@@ -14,18 +24,6 @@ body:
       description: if you want, you can include screenshots as well :)
     validations:
       required: true
-  - type: checkboxes
-    id: platform
-    attributes:
-      label: platform
-      description: On which operating system did this bug emerge?
-      options:
-        - label: linux
-          required: false
-        - label: windows
-          required: false
-        - label: macos
-          required: false
   - type: textarea
     id: expected
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/core_implementation.yml b/.github/ISSUE_TEMPLATE/core_implementation.yml
index 0fa7b35..c254dbc 100644
--- a/.github/ISSUE_TEMPLATE/core_implementation.yml
+++ b/.github/ISSUE_TEMPLATE/core_implementation.yml
@@ -3,6 +3,16 @@ description: Create a report to help us improve
 title: "🏗️ [Core Feature]: "
 labels: ["core"]
 body:
+  - type: checkboxes
+    id: templates
+    attributes:
+      label: templates
+      description: Which template is this issue related to?
+      options:
+        - label: Generic Runtime Template
+          required: false
+        - label: Evm Template
+          required: false
   - type: textarea
     id: feature
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 6e3c371..e81066c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,6 +7,16 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill this feature request!
+  - type: checkboxes
+    id: templates
+    attributes:
+      label: templates
+      description: Which template is this issue related to?
+      options:
+        - label: Generic Runtime Template
+          required: false
+        - label: Evm Template
+          required: false
   - type: textarea
     id: feature
     attributes:
diff --git a/.github/workflows/generic.yml b/.github/workflows/generic.yml
index 2ec9436..93b4db2 100644
--- a/.github/workflows/generic.yml
+++ b/.github/workflows/generic.yml
@@ -1,4 +1,4 @@
-name: "cargo tests"
+name: "generic template cargo tests"
 
 on:
   push:
@@ -52,9 +52,6 @@ jobs:
       - name: git checkout
         uses: actions/checkout@v4
 
-      - name: cd to `generic` template
-        run: cd generic-template
-
       - name: Install Protoc
         uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
         with:
diff --git a/.gitignore b/.gitignore
index c0acee0..a9b3d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/target/
+**/target/
 /.idea
 .DS_Store
 .thumbs.db
@@ -21,6 +21,6 @@ docs/node_modules
 docs/build
 
 # zombienet stuff
-zombienet-macos
-zombienet-linux-x64
-bin-*
\ No newline at end of file
+**/zombienet-macos
+**/zombienet-linux-x64
+**/bin-*