diff --git a/charts/prometheus/v6.3.0/questions.yml b/charts/prometheus/v6.3.0/questions.yml
index 24c6244..ca6ebed 100644
--- a/charts/prometheus/v6.3.0/questions.yml
+++ b/charts/prometheus/v6.3.0/questions.yml
@@ -166,13 +166,6 @@ questions:
   group: "Alertmanager"
   label: Enable Alertmanager
   show_subquestion_if: true
-- variable: alertmanager.service.hostPort
-  default: "9100"
-  description: "Alertmanager Service hostPort"
-  type: string
-  group: "Alertmanager"
-  label: Alertmanager Service hostPort
-  show_if: "alertmanager.enabled=true"
 - variable: alertmanager.ingress.enabled
   default: "false"
   description: "Expose alertmanager using Layer 7 Load Balancer - ingress"
@@ -233,3 +226,18 @@ questions:
     type: storageclass
     label: Alertmanager Persistent Volume StorageClass
     show_if: "alertmanager.enabled=true"
+# NodeExporter
+- variable: nodeExporter.enabled
+  default: "true"
+  description: "If true, create nodeExporter"
+  type: boolean
+  group: "NodeExporter"
+  label: Enable NodeExporter
+  show_subquestion_if: true
+- variable: nodeExporter.service.hostPort
+  default: "9100"
+  description: "NodeExporter hostPort"
+  type: string
+  group: "NodeExporter"
+  label: NodeExporter hostPort
+  show_if: "nodeExporter.enabled=true"