diff --git a/samples/crewai/compose.local.yaml b/samples/crewai/compose.local.yaml
index e18c116b..6f54d892 100644
--- a/samples/crewai/compose.local.yaml
+++ b/samples/crewai/compose.local.yaml
@@ -36,19 +36,11 @@ services:
       DATABASE_URL: postgres://postgres:password@postgres:5432/postgres
       DJANGO_SECRET_KEY: 5k6qi_gzy65bz2soxl6k(rsrw)0z3ws!zmjzsbe+wkp1ovfayg
 
+models:
   chat:
-    provider:
-      type: model
-      options:
-        model: ai/gemma3:1B-Q4_K_M
-    x-defang-llm: true
-
+    model: ai/gemma3:1B-Q4_K_M
   embedding:
-    provider:
-      type: model
-      options:
-        model: ai/mxbai-embed-large
-    x-defang-llm: true
+    model: ai/mxbai-embed-large
 
 volumes:
   pgdata:
diff --git a/samples/crewai/compose.yaml b/samples/crewai/compose.yaml
index 2c232310..0eb23cd0 100644
--- a/samples/crewai/compose.yaml
+++ b/samples/crewai/compose.yaml
@@ -79,29 +79,11 @@ services:
         reservations:
           cpus: "0.5"
           memory: 512M
-  chat:
-    provider:
-      type: model
-      options:
-        model: chat-default
+
+models:
+  llm:
+    model: chat-default
     x-defang-llm: true
-    environment:
-      OPENAI_API_KEY: defang
-    deploy:
-      resources:
-        reservations:
-          cpus: "0.5"
-          memory: 512M
   embedding:
-    provider:
-      type: model
-      options:
-        model: embedding-default
+    model: embedding-default
     x-defang-llm: true
-    environment:
-      OPENAI_API_KEY: defang
-    deploy:
-      resources:
-        reservations:
-          cpus: "0.5"
-          memory: 512M
diff --git a/samples/mastra-extended/compose.dev.yaml b/samples/mastra-extended/compose.dev.yaml
index c49f331e..cba29c62 100644
--- a/samples/mastra-extended/compose.dev.yaml
+++ b/samples/mastra-extended/compose.dev.yaml
@@ -70,19 +70,11 @@ services:
     ports:
       - 6379:6379
 
+models:
   chat:
-    provider:
-      type: model
-      options:
-        model: ai/qwen2.5:3B-Q4_K_M
-    x-defang-llm: true
-
+    model: ai/qwen2.5:3B-Q4_K_M
   embedding:
-    provider:
-      type: model
-      options:
-        model: ai/mxbai-embed-large
-    x-defang-llm: true
+    model: ai/mxbai-embed-large
 
 volumes:
   pgdata:
diff --git a/samples/mastra-extended/compose.yaml b/samples/mastra-extended/compose.yaml
index 07b160b5..c9a6789d 100644
--- a/samples/mastra-extended/compose.yaml
+++ b/samples/mastra-extended/compose.yaml
@@ -99,29 +99,15 @@ services:
         reservations:
           cpus: "0.25"
           memory: 256M
+
+model:
   chat:
-    provider:
-      type: model
-      options:
-        model: chat-default
+    model: chat-default
     x-defang-llm: true
     environment:
       OPENAI_API_KEY: defang
-    deploy:
-      resources:
-        reservations:
-          cpus: "0.5"
-          memory: 512M
   embedding:
-    provider:
-      type: model
-      options:
-        model: embedding-default
+    model: embedding-default
     x-defang-llm: true
     environment:
       OPENAI_API_KEY: defang
-    deploy:
-      resources:
-        reservations:
-          cpus: "0.5"
-          memory: 512M