diff --git a/rules/pwpolicy/pwpolicy_account_lockout_enforce.yaml b/rules/pwpolicy/pwpolicy_account_lockout_enforce.yaml
index c7c055d1..86b3242c 100644
--- a/rules/pwpolicy/pwpolicy_account_lockout_enforce.yaml
+++ b/rules/pwpolicy/pwpolicy_account_lockout_enforce.yaml
@@ -33,8 +33,10 @@ ios:
 odv:
   hint: "Number of failed attempts."
   recommended: 6
-  cis_lvl1: 6
-  cis_lvl2: 6
+  cis_lvl1_byod: 6
+  cis_lvl2_byod: 6
+  cis_lvl1_enterprise: 6
+  cis_lvl2_enterprise: 6  
   ios_stig: 10
   ios_stig_byoad: 10
 tags:
diff --git a/rules/pwpolicy/pwpolicy_max_grace_period_enforce.yaml b/rules/pwpolicy/pwpolicy_max_grace_period_enforce.yaml
index 76f0c05d..b4f5aa84 100644
--- a/rules/pwpolicy/pwpolicy_max_grace_period_enforce.yaml
+++ b/rules/pwpolicy/pwpolicy_max_grace_period_enforce.yaml
@@ -31,8 +31,10 @@ iOS:
 odv:
   hint: "Maximum Grace Period in Minutes."
   recommended: 0
-  cis_lvl1: 0
-  cis_lvl2: 0
+  cis_lvl1_byod: 0
+  cis_lvl2_byod: 0
+  cis_lvl1_enterprise: 0
+  cis_lvl2_enterprise: 0  
   ios_stig: 5
   ios_stig_byoad: 5
 tags:
diff --git a/rules/pwpolicy/pwpolicy_max_inactivity_enforce.yaml b/rules/pwpolicy/pwpolicy_max_inactivity_enforce.yaml
index 0a6e5be6..b9c1267a 100644
--- a/rules/pwpolicy/pwpolicy_max_inactivity_enforce.yaml
+++ b/rules/pwpolicy/pwpolicy_max_inactivity_enforce.yaml
@@ -31,8 +31,10 @@ ios:
 odv:
   hint: "Maximum Auto-Lock in Minutes."
   recommended: 2
-  cis_lvl1: 2
-  cis_lvl2: 2
+  cis_lvl1_byod: 2
+  cis_lvl2_byod: 2
+  cis_lvl1_enterprise: 2
+  cis_lvl2_enterprise: 2  
   ios_stig: 5
   ios_stig_byoad: 5
 tags:
diff --git a/rules/pwpolicy/pwpolicy_minimum_length_enforce.yaml b/rules/pwpolicy/pwpolicy_minimum_length_enforce.yaml
index 8fab2a7a..b415a99b 100644
--- a/rules/pwpolicy/pwpolicy_minimum_length_enforce.yaml
+++ b/rules/pwpolicy/pwpolicy_minimum_length_enforce.yaml
@@ -32,8 +32,10 @@ ios:
 odv:
   hint: "Minimum passcode length."
   recommended: 6
-  cis_lvl1: 6
-  cis_lvl2: 6
+  cis_lvl1_byod: 6
+  cis_lvl2_byod: 6
+  cis_lvl1_enterprise: 6
+  cis_lvl2_enterprise: 6
   ios_stig: 6
   ios_stig_byoad: 6
 tags:
@@ -44,7 +46,7 @@ tags:
   - cis_lvl1_byod
   - cis_lvl2_byod
   - cis_lvl1_enterprise
-  - cis_lvl2_enterprise
+  - cis_lvl1_enterprise
   - cisv8
   - ios_stig
   - ios_stig_byoad