diff --git a/deployments/k8s/deployment.yaml b/deployments/k8s/deployment.yaml
index 4eb81f47..74c242f7 100644
--- a/deployments/k8s/deployment.yaml
+++ b/deployments/k8s/deployment.yaml
@@ -1,36 +1,22 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: policy-discovery-service
-  labels:
-    service: policy-discovery-service
-spec:
-  ports:
-  - port: 9089
-    targetPort: 9089
-    protocol: TCP
-  selector:
-    container: policy-discovery-service
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: policy-discovery-service
+  name: knoxautopolicy
   labels:
-    deployment: policy-discovery-service
+    deployment: knoxautopolicy
 spec:
   selector:
     matchLabels:
-      container: policy-discovery-service
+      container: knoxautopolicy
   template:
     metadata:
       labels:
-        container: policy-discovery-service
+        container: knoxautopolicy
     spec:
       containers:
       - image: gcr.io/accuknox/snapshot/knoxautopolicy:latest 
         #image: accuknox/knoxautopolicy:latest
-        name: policy-discovery-service
+        name: knoxautopolicy
         ports:
         - containerPort: 9089
           protocol: TCP
@@ -41,5 +27,5 @@ spec:
       volumes:
         - name: config-volume
           configMap:
-            name: policy-discovery-service-config
+            name: knoxautopolicy-config
 
diff --git a/deployments/k8s/dev-config.yaml b/deployments/k8s/dev-config.yaml
index 9af397c8..decc3533 100644
--- a/deployments/k8s/dev-config.yaml
+++ b/deployments/k8s/dev-config.yaml
@@ -32,7 +32,7 @@ data:
       bootstrap-servers: "dev-kafka-kafka-bootstrap.accuknox-dev-kafka.svc.cluster.local:9092"
       group-id: policy.cilium
       topics: 
-        - cilium-telemetry-test
+        - cilium-telemetry
         - kubearmor-syslogs
       ssl:
         enabled: false
diff --git a/deployments/k8s/service.yaml b/deployments/k8s/service.yaml
new file mode 100644
index 00000000..cd69cec6
--- /dev/null
+++ b/deployments/k8s/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: knoxautopolicy
+  labels:
+    service: knoxautopolicy
+spec:
+  ports:
+  - port: 9089
+    targetPort: 9089
+    protocol: TCP
+  selector:
+    container: knoxautopolicy
diff --git a/src/build/Dockerfile.autopol b/src/build/Dockerfile.autopol
index 7886852f..8b81ff9b 100644
--- a/src/build/Dockerfile.autopol
+++ b/src/build/Dockerfile.autopol
@@ -23,8 +23,8 @@ RUN go build -o knoxAutoPolicy main.go
 
 ### Make executable image
 
-#FROM debian:buster
-FROM artifactory.accuknox.com/accuknox/ubuntu:bionic-20210512 
+FROM debian:buster
+#FROM artifactory.accuknox.com/accuknox/ubuntu:bionic-20210512 
 
 COPY conf/local.yaml conf/local.yaml
 COPY --from=builder /usr/src/knox/knoxAutoPolicy /knoxAutoPolicy
diff --git a/src/conf/local.yaml b/src/conf/local.yaml
index 239a6802..9266e486 100644
--- a/src/conf/local.yaml
+++ b/src/conf/local.yaml
@@ -26,7 +26,7 @@ kafka:
   bootstrap-servers: "dev-kafka-kafka-bootstrap.accuknox-dev-kafka.svc.cluster.local:9092"
   group-id: policy.cilium
   topics: 
-    - cilium-telemetry-test
+    - cilium-telemetry
     - kubearmor-syslogs
   ssl:
     enabled: false
diff --git a/src/main.go b/src/main.go
index f52cfd8c..dfe58e6b 100644
--- a/src/main.go
+++ b/src/main.go
@@ -49,6 +49,6 @@ func main() {
 	// start autopolicy service
 	log.Info().Msgf("KnoxAutoPolicy gRPC server on %s port started", grpcserver.PortNumber)
 	if err := server.Serve(lis); err != nil {
-		log.Error().Msgf("failed to serve: %s", err)
+		log.Error().Msgf("Failed to serve: %v", err)
 	}
 }