diff --git a/deploy/20-deployment.yaml b/deploy/20-deployment.yaml
index 9bbd273..e906a80 100644
--- a/deploy/20-deployment.yaml
+++ b/deploy/20-deployment.yaml
@@ -1,5 +1,5 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: serving.knative.dev/v1
+kind: Service
 metadata:
   name: agent-builder
   namespace: agents
@@ -7,24 +7,25 @@ metadata:
     app: agent-builder
     a2a/managed-by: control-plane
 spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: agent-builder
   template:
     metadata:
       labels:
         app: agent-builder
+      annotations:
+        autoscaling.knative.dev/minScale: "0"
+        autoscaling.knative.dev/maxScale: "20"
+        autoscaling.knative.dev/metric: concurrency
+        autoscaling.knative.dev/target: "1"
     spec:
+      containerConcurrency: 1
+      timeoutSeconds: 1200
       containers:
         - name: agent
           image: registry.a2acloud.io/agents/agent-builder:53ecc9a0cb96530a07b3ed6cd7f5b48ebb7b6b88
           imagePullPolicy: Always
           ports:
             - containerPort: 8000
-              name: http
+              name: http1
           env:
             - name: A2A_AGENT_IMAGE
               value: registry.a2acloud.io/agents/agent-builder:53ecc9a0cb96530a07b3ed6cd7f5b48ebb7b6b88
@@ -57,19 +58,19 @@ spec:
             requests: {cpu: 200m, memory: 512Mi}
             limits: {cpu: 1, memory: 1Gi}
 ---
-apiVersion: v1
-kind: Service
+apiVersion: serving.knative.dev/v1beta1
+kind: DomainMapping
 metadata:
-  name: agent-builder
+  name: agent-builder.a2acloud.io
   namespace: agents
-spec:
-  type: ClusterIP
-  selector:
+  labels:
     app: agent-builder
-  ports:
-    - name: http
-      port: 80
-      targetPort: 8000
+    a2a/managed-by: control-plane
+spec:
+  ref:
+    apiVersion: serving.knative.dev/v1
+    kind: Service
+    name: agent-builder
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress