diff --git a/compose.yaml b/compose.yaml
index 9953d23..19b2b87 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,7 +2,7 @@
 services:
 
   converge-builder:
-    image: $REGISTRY/converge-builder:1.0
+    image: $REGISTRY/converge-builder:1.0.0
     build:
       context: .
       dockerfile: Dockerfile.base
@@ -10,7 +10,7 @@ services:
       - build_only
 
   converge:
-    image: $REGISTRY/converge:1.0
+    image: $REGISTRY/converge:1.0.0
     build:
       context: .
       dockerfile: Dockerfile.prod
@@ -21,7 +21,7 @@ services:
 
 
   converge-tester:
-    image: $REGISTRY/converge-test:1.0
+    image: $REGISTRY/converge-test:1.0.0
     build:
       context: .
       dockerfile: Dockerfile.test
diff --git a/kubernetes/README.md b/kubernetes/README.md
new file mode 100644
index 0000000..0734774
--- /dev/null
+++ b/kubernetes/README.md
@@ -0,0 +1,6 @@
+
+
+
+```
+halm install converge --set registry=my.registry.com 
+```
\ No newline at end of file
diff --git a/kubernetes/converge/templates/deployment.yaml b/kubernetes/converge/templates/deployment.yaml
new file mode 100644
index 0000000..4fab131
--- /dev/null
+++ b/kubernetes/converge/templates/deployment.yaml
@@ -0,0 +1,29 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: converge
+  name: converge
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: converge
+  template:
+    metadata:
+      labels:
+        app: converge
+        prometheus-scrapable: "true"
+    spec:
+      containers:
+        - image: {{.Values.registry}}/converge:{{.Values.version}}
+          imagePullPolicy: Always
+          name: converge
+          ports:
+            - containerPort: 8000
+              name: http
+            - containerPort: 8001
+              name: prometheus
+          args:
+            - --pprof
diff --git a/kubernetes/converge/templates/service.yaml b/kubernetes/converge/templates/service.yaml
new file mode 100644
index 0000000..879ca10
--- /dev/null
+++ b/kubernetes/converge/templates/service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: converge
+  name: converge
+  namespace: {{.Release.Namespace}}
+spec:
+  ports:
+    - port: 8000
+      protocol: TCP
+      name: http
+    - port: 8001
+      protocol: TCP
+      name: prometheus
+  selector:
+    app: converge
diff --git a/kubernetes/servicemonitor.yaml b/kubernetes/converge/templates/servicemonitor.yaml
similarity index 56%
rename from kubernetes/servicemonitor.yaml
rename to kubernetes/converge/templates/servicemonitor.yaml
index 0eb5127..d032062 100644
--- a/kubernetes/servicemonitor.yaml
+++ b/kubernetes/converge/templates/servicemonitor.yaml
@@ -2,13 +2,14 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: converge-monitoring
+  namespace: {{ .Release.Namespace}}
 spec:
   endpoints:
-  - honorLabels: true
-    path: /metrics
-    scheme: http
-    scrapeTimeout: 30s
-    port: prometheus
+    - honorLabels: true
+      path: /metrics
+      scheme: http
+      scrapeTimeout: 30s
+      port: prometheus
   selector:
     matchLabels:
       app: converge
diff --git a/kubernetes/deployment.yaml b/kubernetes/deployment.yaml
deleted file mode 100644
index 7f0a39e..0000000
--- a/kubernetes/deployment.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: converge
-  name: converge
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: converge
-  template:
-    metadata:
-      labels:
-        app: converge
-        prometheus-scrapable: "true"
-    spec:
-      containers:
-      - image: your.repo.com/converge:1.0
-        imagePullPolicy: Always 
-        name: converge
-        ports:
-          - containerPort: 8000
-            name: http
-          - containerPort: 8001
-            name: prometheus
-        args:
-          - --pprof
diff --git a/kubernetes/service.yaml b/kubernetes/service.yaml
deleted file mode 100644
index 4e0ef74..0000000
--- a/kubernetes/service.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: converge
-  name: converge
-spec:
-  ports:
-  - port: 8000
-    protocol: TCP
-    name: http
-  - port: 8001
-    protocol: TCP
-    name: prometheus
-  selector:
-    app: converge