diff --git a/kubernetes/esr/templates/all-services.yaml b/kubernetes/esr/templates/all-services.yaml
new file mode 100644
index 0000000..68f0db7
--- /dev/null
+++ b/kubernetes/esr/templates/all-services.yaml
@@ -0,0 +1,53 @@
+#{{ if not .Values.disableEsrServer }}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: esr-esrserver
+  name: esr-esrserver
+  namespace: "{{ .Values.nsPrefix }}-esr"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-esr-server",
+          "version": "v1",
+          "url": "/api/aai-esr-server/v1",
+          "protocol": "REST",
+          "port": "{{.Values.esrserver.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: esr-esrserver
+    port: {{.Values.esrserver.port}}
+  selector:
+    app: esr-esrserver
+#{{ end }}
+#{{ if not .Values.disableEsrGui }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: esr-esrgui
+  name: esr-esrgui
+  namespace: "{{ .Values.nsPrefix }}-esr"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-esr-gui",
+          "version": "v1",
+          "url": "/esr-gui",
+          "protocol": "UI",
+          "port": "{{.Values.esrgui.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: esr-esrgui
+    port: {{.Values.esrgui.port}}
+  selector:
+    app: esr-esrgui
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/esr/templates/esr-esrgui-deployment.yaml b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
new file mode 100644
index 0000000..6c3ddf4
--- /dev/null
+++ b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
@@ -0,0 +1,35 @@
+#{{ if not .Values.disableesrgui }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: esr-esrgui
+  name: esr-esrgui
+  namespace: "{{ .Values.nsPrefix }}-esr"
+spec:
+  selector:
+    matchLabels:
+      app: esr-esrgui
+  template:
+    metadata:
+      labels:
+        app: esr-esrgui
+      name: esr-esrgui
+    spec:
+      containers:
+      - image: {{ .Values.esrgui.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: esr-esrgui
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.esrgui.port }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
new file mode 100644
index 0000000..7724fa0
--- /dev/null
+++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
@@ -0,0 +1,35 @@
+#{{ if not .Values.disableUuiUui }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: esr-esrserver
+  name: esr-esrserver
+  namespace: "{{ .Values.nsPrefix }}-esr"
+spec:
+  selector:
+    matchLabels:
+      app: esr-esrserver
+  template:
+    metadata:
+      labels:
+        app: esr-esrserver
+      name: esr-esrserver
+    spec:
+      containers:
+      - image: {{ .Values.esrserver.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: esr-esrserver
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.esrserver.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.esrserver.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file