diff --git a/.github/ISSUE_TEMPLATE/1_bug_template.yml b/.github/ISSUE_TEMPLATE/1_bug_template.yml
index 7a2b73fd..c0bbce4b 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_template.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_template.yml
@@ -32,6 +32,7 @@ body:
         - Mac
         - BSD
         - Other (Please let us know in description)
+        - N/A
     validations:
       required: true
 
@@ -56,6 +57,7 @@ body:
         - GPU-Nvidia
         - GPU-AMD
         - GPU-other (Please let us know in description)
+        - N/A
     validations:
       required: true
 
@@ -67,6 +69,7 @@ body:
         - label: Pull docker images from hub.docker.com
         - label: Build docker images from source
         - label: Other
+        - label: N/A
     validations:
       required: true
 
@@ -79,6 +82,7 @@ body:
         - label: Docker Compose
         - label: Kubernetes
         - label: Other
+        - label: N/A
     validations:
       required: true
 
@@ -90,6 +94,7 @@ body:
         - Single Node
         - Multiple Nodes
         - Other
+        - N/A
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/2_feature_template.yml b/.github/ISSUE_TEMPLATE/2_feature_template.yml
index 8f60e88c..d4828a99 100644
--- a/.github/ISSUE_TEMPLATE/2_feature_template.yml
+++ b/.github/ISSUE_TEMPLATE/2_feature_template.yml
@@ -32,6 +32,7 @@ body:
         - Mac
         - BSD
         - Other (Please let us know in description)
+        - N/A
     validations:
       required: true
 
@@ -56,6 +57,7 @@ body:
         - GPU-Nvidia
         - GPU-AMD
         - GPU-other (Please let us know in description)
+        - N/A
     validations:
       required: true
 
@@ -67,6 +69,7 @@ body:
         - Single Node
         - Multiple Nodes
         - Other
+        - N/A
       default: 0
     validations:
       required: true