diff --git a/playbooks/site.yml b/playbooks/site.yml
index 7b8fd8c1..a962f8d3 100755
--- a/playbooks/site.yml
+++ b/playbooks/site.yml
@@ -152,8 +152,10 @@
   tasks: 
     - include_role: 
         name: influxdb
+      when: monitoring|default(false)|bool
     - include_role: 
         name: grafana
+      when: monitoring|default(false)|bool
 
 - hosts: all
   vars:
@@ -169,3 +171,4 @@
       when: slurm|default(false)|bool
     - include_role: 
         name: telegraf
+      when: monitoring|default(false)|bool
diff --git a/schema.yaml b/schema.yaml
index b8b16a59..0f029ada 100755
--- a/schema.yaml
+++ b/schema.yaml
@@ -559,6 +559,11 @@ variables:
     title: "Install Spack package manager"
     default: false
 
+  monitoring:
+    type: boolean
+    title: "Install HPC Cluster Monitoring"
+    default: false
+
   autoscaling:
     type: boolean
     title: "Use Slurm to launch additional clusters"
@@ -580,11 +585,6 @@ variables:
     visible:
       not:
         - ${inst_prin}
-    #required: 
-    #  and:
-    #    - ${autoscaling}
-    #    not:
-    #      - ${inst_prin}
 
   api_fingerprint:
     type: string
@@ -593,11 +593,6 @@ variables:
     visible:
       not:
         - ${inst_prin}
-    #required: 
-    #  and:
-    #    - ${autoscaling}
-    #    not:
-    #      - ${inst_prin}
 
   api_user_ocid:
     type: string
@@ -606,11 +601,7 @@ variables:
     visible:
       not:
         - ${inst_prin}
-    #required: 
-    #  and:
-    #    - ${autoscaling}
-    #    not:
-    #      - ${inst_prin}
+        
   configure: 
     type: boolean
     title: "Configure system"