diff --git a/src/bicep/mlz.json b/src/bicep/mlz.json
index df9569d5..fad9b521 100644
--- a/src/bicep/mlz.json
+++ b/src/bicep/mlz.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.31.92.45157",
-      "templateHash": "4662751976093611386"
+      "version": "0.32.4.45862",
+      "templateHash": "8151033231948366463"
     }
   },
   "parameters": {
@@ -887,8 +887,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "15810721730485220824"
+              "version": "0.32.4.45862",
+              "templateHash": "11951558504901001113"
             }
           },
           "parameters": {
@@ -967,8 +967,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "11125044402666498605"
+                      "version": "0.32.4.45862",
+                      "templateHash": "9348185205265061346"
                     }
                   },
                   "parameters": {
@@ -1561,8 +1561,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "17619606927129129347"
+                      "version": "0.32.4.45862",
+                      "templateHash": "10126517616466326568"
                     }
                   },
                   "parameters": {
@@ -1706,8 +1706,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "5311912111839888762"
+              "version": "0.32.4.45862",
+              "templateHash": "15492587269848133701"
             }
           },
           "parameters": {
@@ -1766,8 +1766,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "9371138343009436350"
+                      "version": "0.32.4.45862",
+                      "templateHash": "6826910029633627352"
                     }
                   },
                   "parameters": {
@@ -1907,8 +1907,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "6531207997218247037"
+              "version": "0.32.4.45862",
+              "templateHash": "16335464603269917298"
             }
           },
           "parameters": {
@@ -2084,8 +2084,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "17606032368841347839"
+                      "version": "0.32.4.45862",
+                      "templateHash": "10636575923789345405"
                     }
                   },
                   "parameters": {
@@ -2352,8 +2352,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "3681943409502537301"
+                              "version": "0.32.4.45862",
+                              "templateHash": "13846782101975662570"
                             }
                           },
                           "parameters": {
@@ -2431,8 +2431,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "3681943409502537301"
+                              "version": "0.32.4.45862",
+                              "templateHash": "13846782101975662570"
                             }
                           },
                           "parameters": {
@@ -2512,8 +2512,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "18425321023142226965"
+                              "version": "0.32.4.45862",
+                              "templateHash": "9322941388060090809"
                             }
                           },
                           "parameters": {
@@ -2613,8 +2613,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "15002544166394392504"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5483231664830769159"
                             }
                           },
                           "parameters": {
@@ -2682,8 +2682,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "16817025486402215719"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5645415839002404423"
                             }
                           },
                           "parameters": {
@@ -2796,8 +2796,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "782319697243698272"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5002688214644088862"
                             }
                           },
                           "parameters": {
@@ -2886,8 +2886,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "782319697243698272"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5002688214644088862"
                             }
                           },
                           "parameters": {
@@ -3000,8 +3000,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "4750034338253477937"
+                              "version": "0.32.4.45862",
+                              "templateHash": "10378269228460397233"
                             }
                           },
                           "parameters": {
@@ -3401,8 +3401,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "11818136489056939588"
+                      "version": "0.32.4.45862",
+                      "templateHash": "17886708743216395115"
                     }
                   },
                   "parameters": {
@@ -3519,8 +3519,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "3681943409502537301"
+                              "version": "0.32.4.45862",
+                              "templateHash": "13846782101975662570"
                             }
                           },
                           "parameters": {
@@ -3602,8 +3602,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "18425321023142226965"
+                              "version": "0.32.4.45862",
+                              "templateHash": "9322941388060090809"
                             }
                           },
                           "parameters": {
@@ -3705,8 +3705,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "15002544166394392504"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5483231664830769159"
                             }
                           },
                           "parameters": {
@@ -3782,8 +3782,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "16817025486402215719"
+                              "version": "0.32.4.45862",
+                              "templateHash": "5645415839002404423"
                             }
                           },
                           "parameters": {
@@ -3930,8 +3930,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "11553909803736438916"
+                      "version": "0.32.4.45862",
+                      "templateHash": "13320362037311908604"
                     }
                   },
                   "parameters": {
@@ -3983,8 +3983,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "5574526676512163672"
+                              "version": "0.32.4.45862",
+                              "templateHash": "6477042594817819590"
                             }
                           },
                           "parameters": {
@@ -4062,8 +4062,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "10267893616110384815"
+                      "version": "0.32.4.45862",
+                      "templateHash": "17601114229673889726"
                     }
                   },
                   "parameters": {
@@ -4115,8 +4115,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "5574526676512163672"
+                              "version": "0.32.4.45862",
+                              "templateHash": "6477042594817819590"
                             }
                           },
                           "parameters": {
@@ -4192,8 +4192,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "17171440191267536743"
+                      "version": "0.32.4.45862",
+                      "templateHash": "16683221993525863412"
                     }
                   },
                   "parameters": {
@@ -4269,8 +4269,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "16077950968688123011"
+                              "version": "0.32.4.45862",
+                              "templateHash": "8205818676743522558"
                             }
                           },
                           "parameters": {
@@ -4435,8 +4435,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "12787329163785242553"
+              "version": "0.32.4.45862",
+              "templateHash": "17139779324064444555"
             }
           },
           "parameters": {
@@ -4524,8 +4524,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "11761568940379970751"
+                      "version": "0.32.4.45862",
+                      "templateHash": "16844719077752965053"
                     }
                   },
                   "parameters": {
@@ -4782,8 +4782,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "4207798980384159491"
+                      "version": "0.32.4.45862",
+                      "templateHash": "16362514702834742003"
                     }
                   },
                   "parameters": {
@@ -4862,8 +4862,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "1966035938992047983"
+                              "version": "0.32.4.45862",
+                              "templateHash": "10296095440786899315"
                             }
                           },
                           "parameters": {
@@ -4957,8 +4957,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "7930493629995578222"
+                      "version": "0.32.4.45862",
+                      "templateHash": "9965398560847425439"
                     }
                   },
                   "parameters": {
@@ -5102,8 +5102,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "17900321188332105834"
+              "version": "0.32.4.45862",
+              "templateHash": "15604002399742409228"
             }
           },
           "parameters": {
@@ -5188,8 +5188,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "17298378299072098272"
+                      "version": "0.32.4.45862",
+                      "templateHash": "4693042468029562317"
                     }
                   },
                   "parameters": {
@@ -5356,8 +5356,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "12087616562036012055"
+                      "version": "0.32.4.45862",
+                      "templateHash": "4201258207489255416"
                     }
                   },
                   "parameters": {
@@ -5484,8 +5484,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "2081045465267717136"
+                      "version": "0.32.4.45862",
+                      "templateHash": "14844016985076474926"
                     }
                   },
                   "parameters": {
@@ -5712,8 +5712,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "15042212833055960396"
+              "version": "0.32.4.45862",
+              "templateHash": "1404865443950824506"
             }
           },
           "parameters": {
@@ -5889,8 +5889,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "2760766953842709390"
+                      "version": "0.32.4.45862",
+                      "templateHash": "11284204233989942999"
                     }
                   },
                   "parameters": {
@@ -6049,8 +6049,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "10850741356290813493"
+                      "version": "0.32.4.45862",
+                      "templateHash": "9798074046992101466"
                     }
                   },
                   "parameters": {
@@ -6371,8 +6371,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "2785700700806650182"
+                              "version": "0.32.4.45862",
+                              "templateHash": "14487223681416079283"
                             }
                           },
                           "parameters": {
@@ -6538,8 +6538,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "10838080267928735788"
+                      "version": "0.32.4.45862",
+                      "templateHash": "4900779437558833454"
                     }
                   },
                   "parameters": {
@@ -6846,8 +6846,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "2785700700806650182"
+                              "version": "0.32.4.45862",
+                              "templateHash": "14487223681416079283"
                             }
                           },
                           "parameters": {
@@ -6991,8 +6991,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "15042903713059976655"
+              "version": "0.32.4.45862",
+              "templateHash": "7215484757063170166"
             }
           },
           "parameters": {
@@ -7108,8 +7108,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "1625826941635729014"
+                      "version": "0.32.4.45862",
+                      "templateHash": "5654874488513857493"
                     }
                   },
                   "parameters": {
@@ -7392,8 +7392,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "11341470403202647858"
+              "version": "0.32.4.45862",
+              "templateHash": "4827140712785448356"
             }
           },
           "parameters": {
@@ -7478,8 +7478,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "4687229436121899773"
+                      "version": "0.32.4.45862",
+                      "templateHash": "17453871854351031685"
                     }
                   },
                   "parameters": {
@@ -7565,8 +7565,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "6315472047633861096"
+                      "version": "0.32.4.45862",
+                      "templateHash": "4978146155106268302"
                     }
                   },
                   "parameters": {
@@ -7652,8 +7652,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "2073766618455932098"
+                      "version": "0.32.4.45862",
+                      "templateHash": "11508259122426462594"
                     }
                   },
                   "parameters": {
@@ -7734,8 +7734,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "9546260853018527046"
+                      "version": "0.32.4.45862",
+                      "templateHash": "2381187713713410342"
                     }
                   },
                   "parameters": {
@@ -7816,8 +7816,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "16372121177996394493"
+                      "version": "0.32.4.45862",
+                      "templateHash": "8769800666090375073"
                     }
                   },
                   "parameters": {
@@ -7894,8 +7894,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "3821176451773778831"
+                      "version": "0.32.4.45862",
+                      "templateHash": "16077105841277051871"
                     }
                   },
                   "parameters": {
@@ -7975,8 +7975,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "1721966359516622278"
+                      "version": "0.32.4.45862",
+                      "templateHash": "5679027658072815414"
                     }
                   },
                   "parameters": {
@@ -8047,8 +8047,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "8510408576984746573"
+                      "version": "0.32.4.45862",
+                      "templateHash": "12213873365826159850"
                     }
                   },
                   "parameters": {
@@ -8133,8 +8133,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "3495057416767671634"
+              "version": "0.32.4.45862",
+              "templateHash": "16277043662738489856"
             }
           },
           "parameters": {
@@ -8190,8 +8190,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "14528983897386416653"
+                      "version": "0.32.4.45862",
+                      "templateHash": "214344042082510625"
                     }
                   },
                   "parameters": {
@@ -8366,8 +8366,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.31.92.45157",
-                              "templateHash": "1966035938992047983"
+                              "version": "0.32.4.45862",
+                              "templateHash": "10296095440786899315"
                             }
                           },
                           "parameters": {
@@ -8464,8 +8464,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.31.92.45157",
-              "templateHash": "17309660590425732791"
+              "version": "0.32.4.45862",
+              "templateHash": "9665025324779031374"
             }
           },
           "parameters": {
@@ -8528,8 +8528,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.31.92.45157",
-                      "templateHash": "17047820191891552534"
+                      "version": "0.32.4.45862",
+                      "templateHash": "1225757599886217549"
                     }
                   },
                   "parameters": {
@@ -8544,7 +8544,7 @@
                     },
                     "enableAutoProvisioning": {
                       "type": "bool",
-                      "defaultValue": true,
+                      "defaultValue": false,
                       "metadata": {
                         "description": "Turn automatic deployment by Defender of the MMA (OMS VM extension) on or off"
                       }
@@ -8701,6 +8701,7 @@
                       }
                     },
                     {
+                      "condition": "[not(or(equals(environment().name, 'AzureCloud'), equals(environment().name, 'AzureUSGovernment')))]",
                       "type": "Microsoft.Security/autoProvisioningSettings",
                       "apiVersion": "2019-01-01",
                       "name": "default",
@@ -8709,6 +8710,7 @@
                       }
                     },
                     {
+                      "condition": "[not(or(equals(environment().name, 'AzureCloud'), equals(environment().name, 'AzureUSGovernment')))]",
                       "type": "Microsoft.Security/workspaceSettings",
                       "apiVersion": "2019-01-01",
                       "name": "default",
diff --git a/src/bicep/modules/defender-for-cloud.bicep b/src/bicep/modules/defender-for-cloud.bicep
index e294e0cd..3d047326 100644
--- a/src/bicep/modules/defender-for-cloud.bicep
+++ b/src/bicep/modules/defender-for-cloud.bicep
@@ -9,7 +9,7 @@ targetScope = 'subscription'
 param defenderPlans array = ['VirtualMachines']
 
 @description('Turn automatic deployment by Defender of the MMA (OMS VM extension) on or off')
-param enableAutoProvisioning bool = true
+param enableAutoProvisioning bool = false
 var autoProvisioning = enableAutoProvisioning ? 'On' : 'Off'
 
 @description('Specify the ID of your custom Log Analytics workspace to collect Defender data.')
@@ -144,16 +144,16 @@ resource defenderStandardSubplanExtensionsAzureCloud 'Microsoft.Security/pricing
 
 
 
-// auto provisioing
+// auto provisioing - check environment type
 
-resource autoProvision 'Microsoft.Security/autoProvisioningSettings@2019-01-01' = {
+resource autoProvision 'Microsoft.Security/autoProvisioningSettings@2019-01-01' = if (!(environment().name == 'AzureCloud' || environment().name == 'AzureUSGovernment') ) {
   name: 'default'
   properties: {
     autoProvision: autoProvisioning
   }
 }
 
-resource securityWorkspaceSettings 'Microsoft.Security/workspaceSettings@2019-01-01' = {
+resource securityWorkspaceSettings 'Microsoft.Security/workspaceSettings@2019-01-01' = if (!(environment().name == 'AzureCloud' || environment().name == 'AzureUSGovernment') ) {
   name: 'default'
   properties: {
     workspaceId: logAnalyticsWorkspaceId