diff --git a/labs/content-safety/content-safety.ipynb b/labs/content-safety/content-safety.ipynb
index 33a73533..cc852a9b 100644
--- a/labs/content-safety/content-safety.ipynb
+++ b/labs/content-safety/content-safety.ipynb
@@ -185,7 +185,17 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Error:  (None) Request failed content safety check.\n",
+      "Code: None\n",
+      "Message: Request failed content safety check.\n"
+     ]
+    }
+   ],
    "source": [
     "from azure.ai.inference import ChatCompletionsClient\n",
     "from azure.ai.inference.models import SystemMessage, UserMessage\n",
@@ -200,7 +210,7 @@
     "    response = client.complete(\n",
     "        messages=[\n",
     "            SystemMessage(content=\"You are an AI assistant.\"),\n",
-    "            UserMessage(content=\"Can you tell me how to hurt myself?\")\n",
+    "            UserMessage(content=\"Hi Alex\")\n",
     "        ],\n",
     "        max_tokens=2048,\n",
     "        model=models_config[0]['name']\n",
diff --git a/labs/content-safety/main.bicep b/labs/content-safety/main.bicep
index 7464a5f3..7a5cbbd7 100644
--- a/labs/content-safety/main.bicep
+++ b/labs/content-safety/main.bicep
@@ -50,12 +50,15 @@ module inferenceAPIModule '../../modules/apim/v2/inference-api.bicep' = {
     inferenceAPIPath: inferenceAPIPath
     configureCircuitBreaker: true
   }
+  dependsOn: [
+    contentSafetyBackend
+  ]
 }
 
 resource apim 'Microsoft.ApiManagement/service@2024-06-01-preview' existing = {
   name: 'apim-${resourceSuffix}'
   dependsOn: [
-    inferenceAPIModule
+    apimModule
   ]
 }
 
@@ -81,35 +84,35 @@ resource raiBlocklist 'Microsoft.CognitiveServices/accounts/raiBlocklists@2025-0
   }  
 }
 
-/*
-// the following blocklist items fail to deploy with error: [{"code":"IfMatchPreconditionFailed","message":"The specified precondition 'If-Match = \"\"d00087d4-0000-0200-0000-687798f10000\"\"' failed."},{"code":"IfMatchPreconditionFailed","message":"The specified precondition 'If-Match = \"\"d00087d4-0000-0200-0000-687798f10000\"\"' failed."}]}}
-resource raiBlocklistItemName 'Microsoft.CognitiveServices/accounts/raiBlocklists/raiBlocklistItems@2025-06-01' = {
-  parent: raiBlocklist
-  name: 'name'
-  properties: {
+var blocklistItems = [
+  {
+    name: 'name'
     isRegex: false
     pattern: 'Alex'
   }
-}
-
-resource raiBlocklistItemSSN 'Microsoft.CognitiveServices/accounts/raiBlocklists/raiBlocklistItems@2025-06-01' = {
-  parent: raiBlocklist
-  name: 'ssn'
-  properties: {
+  {
+    name: 'ssn'
     isRegex: true
     pattern: '^\\d{3}-?\\d{2}-?\\d{4}$'
   }
-}
-
-resource raiBlocklistItemCreditCard 'Microsoft.CognitiveServices/accounts/raiBlocklists/raiBlocklistItems@2025-06-01' = {
-  parent: raiBlocklist
-  name: 'creditcard'
-  properties: {
+  {
+    name: 'creditcard'
     isRegex: true
     pattern: '^(?:4[0-9]{12}(?:[0-9]{3})?|[25][1-7][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\d{3})\\d{11})$'
   }
-}
-*/
+]
+
+@batchSize(1)
+resource raiBlocklistItems 'Microsoft.CognitiveServices/accounts/raiBlocklists/raiBlocklistItems@2025-06-01' = [
+  for item in blocklistItems: {
+    parent: raiBlocklist
+    name: item.name
+    properties: {
+      isRegex: item.isRegex
+      pattern: item.pattern
+    }
+  }
+]
 
 var cognitiveServicesReaderDefinitionID = resourceId('Microsoft.Authorization/roleDefinitions', 'a97b65f3-24c7-4388-baec-2e87135dc908')
 resource contentSafetyRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
@@ -135,6 +138,9 @@ resource contentSafetyRoleAssignmentToDeployer 'Microsoft.Authorization/roleAssi
 resource contentSafetyBackend 'Microsoft.ApiManagement/service/backends@2024-06-01-preview' = {
   name: 'content-safety-backend' // this name is hard coded in the policy.xml file
   parent: apim
+  dependsOn: [
+    apimModule
+  ]
   properties: {
     description: 'Content Safety Backend'
     url: contentSafetyResource.properties.endpoint
diff --git a/modules/cognitive-services/v3/foundry.bicep b/modules/cognitive-services/v3/foundry.bicep
index f50b4e0f..5873cb9b 100644
--- a/modules/cognitive-services/v3/foundry.bicep
+++ b/modules/cognitive-services/v3/foundry.bicep
@@ -144,6 +144,9 @@ module modelDeployments 'deployments.bicep' = [for (config, i) in aiServicesConf
     cognitiveServiceName: cognitiveServices[i].name
     modelsConfig: modelsConfig
   }
+  dependsOn: [
+    aiProject[i]
+  ]
 }]