diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml
new file mode 100644
index 0000000..aea89ad
--- /dev/null
+++ b/kubernetes/aai/templates/gremlin-deployment.yaml
@@ -0,0 +1,62 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: gremlin
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: gremlin
+  template:
+    metadata:
+      labels:
+        app: gremlin
+      name: gremlin
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+              "args": [
+                  "--container-name",
+                  "hbase"
+              ],
+              "command": [
+                  "/root/ready.py"
+              ],
+              "env": [
+                  {
+                      "name": "NAMESPACE",
+                      "valueFrom": {
+                          "fieldRef": {
+                              "apiVersion": "v1",
+                              "fieldPath": "metadata.namespace"
+                          }
+                      }
+                  }
+              ],
+              "image": "oomk8s/readiness-check:1.0.0",
+              "imagePullPolicy": "Always",
+              "name": "gremlin-readiness"
+          }
+          ]'
+    spec:
+      hostname: gremlin
+      containers:
+      - name: gremlin
+        image: {{ .Values.image.gremlinServerImage }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: SERVER_HOST
+          value: "hbase.{{ .Values.nsPrefix }}-aai"
+        - name: SERVER_TABLE
+          value: aaigraph.dev
+        - name: GREMLIN_HOST
+          value: "gremlin.{{ .Values.nsPrefix }}-aai"
+        ports:
+        - containerPort: 8182
+        readinessProbe:
+          tcpSocket:
+            port: 8182
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"