diff --git a/deploy/macae-continer-oc.json b/deploy/macae-continer-oc.json
index f394cd911..1ef3de77f 100644
--- a/deploy/macae-continer-oc.json
+++ b/deploy/macae-continer-oc.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.32.4.45862",
-      "templateHash": "13282901028774763433"
+      "version": "0.33.93.31351",
+      "templateHash": "9524414973084491660"
     }
   },
   "parameters": {
@@ -44,9 +44,6 @@
         "gpt4oCapacity": {
           "type": "int"
         },
-        "cosmosThroughput": {
-          "type": "int"
-        },
         "containerAppSize": {
           "type": "object",
           "properties": {
@@ -67,7 +64,6 @@
       },
       "defaultValue": {
         "gpt4oCapacity": 50,
-        "cosmosThroughput": 1000,
         "containerAppSize": {
           "cpu": "2.0",
           "memory": "4.0Gi",
@@ -147,9 +143,6 @@
         "resource": {
           "id": "autogen",
           "createMode": "Default"
-        },
-        "options": {
-          "throughput": "[parameters('resourceSize').cosmosThroughput]"
         }
       },
       "dependsOn": [
@@ -244,6 +237,11 @@
             "failoverPriority": 0,
             "locationName": "[parameters('location')]"
           }
+        ],
+        "capabilities": [
+          {
+            "name": "EnableServerless"
+          }
         ]
       }
     },
diff --git a/deploy/macae-continer.bicep b/deploy/macae-continer.bicep
index 965b111d8..eb691ebb0 100644
--- a/deploy/macae-continer.bicep
+++ b/deploy/macae-continer.bicep
@@ -15,7 +15,6 @@ param tags object = {}
 @description('The size of the resources to deploy, defaults to a mini size')
 param resourceSize {
   gpt4oCapacity: int
-  cosmosThroughput: int
   containerAppSize: {
     cpu: string
     memory: string
@@ -24,7 +23,6 @@ param resourceSize {
   }
 } = {
   gpt4oCapacity: 50
-  cosmosThroughput: 1000
   containerAppSize: {
     cpu: '2.0'
     memory: '4.0Gi'
@@ -124,6 +122,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         locationName: location
       }
     ]
+    capabilities: [ { name: 'EnableServerless' } ]
   }
 
   resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
@@ -137,9 +136,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         id: 'autogen'
         createMode: 'Default'
       }
-      options: {
-        throughput: resourceSize.cosmosThroughput
-      }
     }
 
     resource memoryContainer 'containers' = {
diff --git a/deploy/macae-dev.bicep b/deploy/macae-dev.bicep
index e50d27001..5157fa92f 100644
--- a/deploy/macae-dev.bicep
+++ b/deploy/macae-dev.bicep
@@ -77,6 +77,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         locationName: cosmosLocation
       }
     ]
+    capabilities: [ { name: 'EnableServerless' } ]
   }
 
   resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
@@ -99,9 +100,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         id: 'autogen'
         createMode: 'Default'
       }
-      options: {
-        throughput: 400
-      }
     }
 
     resource memoryContainer 'containers' = {
diff --git a/deploy/macae-large.bicepparam b/deploy/macae-large.bicepparam
index 52b1a7979..3e88f4452 100644
--- a/deploy/macae-large.bicepparam
+++ b/deploy/macae-large.bicepparam
@@ -2,7 +2,6 @@ using './macae.bicep'
 
 param resourceSize = {
   gpt4oCapacity: 50
-  cosmosThroughput: 1000
   containerAppSize: {
     cpu: '2.0'
     memory: '4.0Gi'
diff --git a/deploy/macae-mini.bicepparam b/deploy/macae-mini.bicepparam
index e4851944a..ee3d65127 100644
--- a/deploy/macae-mini.bicepparam
+++ b/deploy/macae-mini.bicepparam
@@ -2,7 +2,6 @@ using './macae.bicep'
 
 param resourceSize = {
   gpt4oCapacity: 15
-  cosmosThroughput: 400
   containerAppSize: {
     cpu: '1.0'
     memory: '2.0Gi'
diff --git a/deploy/macae.bicep b/deploy/macae.bicep
index d969a8de6..bfa56c9a1 100644
--- a/deploy/macae.bicep
+++ b/deploy/macae.bicep
@@ -18,7 +18,6 @@ param tags object = {}
 @description('The size of the resources to deploy, defaults to a mini size')
 param resourceSize {
   gpt4oCapacity: int
-  cosmosThroughput: int
   containerAppSize: {
     cpu: string
     memory: string
@@ -27,7 +26,6 @@ param resourceSize {
   }
 } = {
   gpt4oCapacity: 50
-  cosmosThroughput: 1000
   containerAppSize: {
     cpu: '2.0'
     memory: '4.0Gi'
@@ -154,6 +152,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         locationName: cosmosLocation
       }
     ]
+    capabilities: [ { name: 'EnableServerless' } ]
   }
 
   resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
@@ -167,9 +166,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
         id: 'autogen'
         createMode: 'Default'
       }
-      options: {
-        throughput: resourceSize.cosmosThroughput
-      }
     }
 
     resource memoryContainer 'containers' = {