diff --git a/Chart.yaml b/Chart.yaml
new file mode 100644
index 0000000..60e4370
--- /dev/null
+++ b/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: aaf
+version: 1.1.0
diff --git a/templates/aaf-cs-deployment.yaml b/templates/aaf-cs-deployment.yaml
new file mode 100644
index 0000000..f240150
--- /dev/null
+++ b/templates/aaf-cs-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: aaf-cs
+  namespace: "{{ .Values.nsPrefix }}-aaf"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: aaf-cs
+  template:
+    metadata:
+      labels:
+        app: aaf-cs
+      name: aaf-cs
+    spec:
+      hostname: aaf-cs
+      containers:
+      - args:
+        image: {{ .Values.image.csImage }}:{{ .Values.image.csVersion }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: "aaf-cs"
+        volumeMounts:
+        - mountPath: /data
+          name: aaf-data
+        readinessProbe:
+          tcpSocket:
+            port: 7000
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+        - name: aaf-data
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data
+      imagePullSecrets:
+      - name: {{ .Values.nsPrefix }}-docker-registry-key
diff --git a/templates/aaf-deployment.yaml b/templates/aaf-deployment.yaml
new file mode 100644
index 0000000..20e21c4
--- /dev/null
+++ b/templates/aaf-deployment.yaml
@@ -0,0 +1,57 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: aaf
+  name: aaf
+  namespace: "{{ .Values.nsPrefix }}-aaf"
+spec:
+  selector:
+    matchLabels:
+      app: aaf
+  template:
+    metadata:
+      labels:
+        app: aaf
+      name: aaf
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+              "args": [
+                  "--container-name",
+                  "aaf-cs"
+              ],
+              "command": [
+                  "/root/ready.py"
+              ],
+              "env": [
+                  {
+                      "name": "NAMESPACE",
+                      "valueFrom": {
+                          "fieldRef": {
+                              "apiVersion": "v1",
+                              "fieldPath": "metadata.namespace"
+                          }
+                      }
+                  }
+              ],
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
+              "name": "aaf-readiness"
+          }
+          ]'
+    spec:
+      containers:
+      - env:
+        - name: CASSANDRA_CLUSTER
+          value: cassandra_container
+        image: {{ .Values.image.aafImage }}:{{ .Values.image.aafVersion }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: aaf
+        readinessProbe:
+          tcpSocket:
+            port: 8101
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: {{ .Values.nsPrefix }}-docker-registry-key
diff --git a/templates/all-services.yaml b/templates/all-services.yaml
new file mode 100644
index 0000000..0d1dc22
--- /dev/null
+++ b/templates/all-services.yaml
@@ -0,0 +1,36 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: aaf-cs
+  namespace: "{{ .Values.nsPrefix }}-aaf"
+  labels:
+    app: aaf-cs
+spec:
+  ports:
+  - name: aaf-cs-port-7000
+    port: 7000
+  - name: aaf-cs-port-7001
+    port: 7001
+  - name: aaf-cs-port-9042
+    port: 9042
+  - name: aaf-cs-port-9160
+    port: 9160
+  selector:
+    app: aaf-cs
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: aaf-authz-service
+  namespace: "{{ .Values.nsPrefix }}-aaf"
+  labels:
+    app: aaf-authz-service
+spec:
+  ports:
+  - name: aaf-authz-service
+    port: 8101
+    nodePort: {{ .Values.nodePortPrefix }}99
+  selector:
+    app: clamp
+  type: NodePort
diff --git a/values.yaml b/values.yaml
new file mode 100644
index 0000000..a8589a3
--- /dev/null
+++ b/values.yaml
@@ -0,0 +1,9 @@
+nsPrefix: onap
+pullPolicy: Always
+nodePortPrefix: 302
+image:
+  readiness: oomk8s/readiness-check:1.0.0
+  aafImage: nexus3.onap.org:10001/onap/aaf/authz-service
+  aafVersion: latest
+  csImage: nexus3.onap.org:10001/library/cassandra
+  csVersion: 2.1.17