diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml
index a1195abf..c76a30a0 100644
--- a/roles/baseline/defaults/main.yml
+++ b/roles/baseline/defaults/main.yml
@@ -213,3 +213,6 @@ private_ingress:
       service:
         annotations:
           networking.gke.io/load-balancer-type: Internal
+
+## NIST Features
+V4_CFG_NIST_FEATURES_ENABLED: false
\ No newline at end of file
diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 10e3535f..3247e6cc 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -4,3 +4,6 @@
 ---
 V4_CFG_POSTGRES_SERVERS:
   default: {}
+
+## NIST Features
+V4_CFG_NIST_FEATURES_ENABLED: false
\ No newline at end of file
diff --git a/roles/vdm/defaults/main.yaml b/roles/vdm/defaults/main.yaml
index 38cddcc6..e948ba6f 100644
--- a/roles/vdm/defaults/main.yaml
+++ b/roles/vdm/defaults/main.yaml
@@ -114,3 +114,6 @@ V4_CFG_MESSAGE_BROKER_PASSWORD: null
 
 ## SAS Workload Orchestrator
 V4_WORKLOAD_ORCHESTRATOR_ENABLED: true
+
+## NIST Features
+V4_CFG_NIST_FEATURES_ENABLED: false
\ No newline at end of file