diff --git a/deployment/kubernetes/templates/webapp/ConfigMap.yml b/deployment/kubernetes/templates/webapp/ConfigMap.yml
new file mode 100644
index 000000000..491b7d1b1
--- /dev/null
+++ b/deployment/kubernetes/templates/webapp/ConfigMap.yml
@@ -0,0 +1,17 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: configmap-{{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/name:	"{{ .Chart.Name }}"
+    app.kubernetes.io/instance:	"{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "configmap webapp"
+    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+data:
+  HOST: "0.0.0.0"
+  PUBLIC_REGISTRATION: "{{ .Values.PUBLIC_REGISTRATION }}"
+  WEBSOCKETS_URI: "{{ .Values.WEBAPP.WEBSOCKETS_URI }}"
+  GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
\ No newline at end of file
diff --git a/deployment/kubernetes/templates/webapp/Deployment.yaml b/deployment/kubernetes/templates/webapp/Deployment.yaml
new file mode 100644
index 000000000..a5b2fcfb5
--- /dev/null
+++ b/deployment/kubernetes/templates/webapp/Deployment.yaml
@@ -0,0 +1,37 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name:  {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/name:	"{{ .Chart.Name }}"
+    app.kubernetes.io/instance:	"{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "deployment webapp"
+    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  replicas: {{ .Values.WEBAPP.REPLICAS }}
+  minReadySeconds: {{ .Values.WEBAPP.MIN_READY_SECONDS }}
+  progressDeadlineSeconds: {{ .Values.WEBAPP.PROGRESS_DEADLINE_SECONDS }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-webapp
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-webapp
+    spec:
+      containers:
+      - name: container-{{ .Release.Name }}-webapp
+        image: "{{ .Values.WEBAPP.DOCKER_IMAGE_REPO }}:{{ .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.WEBAPP.DOCKER_IMAGE_PULL_POLICY }}
+        ports:
+        - containerPort: 3000
+        envFrom:
+        - configMapRef:
+            name: configmap-{{ .Release.Name }}-webapp
+        - secretRef:
+            name: secret-{{ .Release.Name }}-webapp
+      restartPolicy: {{ .Values.WEBAPP.CONTAINER_RESTART_POLICY }}
+      terminationGracePeriodSeconds: {{ .Values.WEBAPP.CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS }}
\ No newline at end of file
diff --git a/deployment/kubernetes/templates/webapp/Secret.yaml b/deployment/kubernetes/templates/webapp/Secret.yaml
new file mode 100644
index 000000000..a2e22563c
--- /dev/null
+++ b/deployment/kubernetes/templates/webapp/Secret.yaml
@@ -0,0 +1,13 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: secret-{{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/name:	"{{ .Chart.Name }}"
+    app.kubernetes.io/instance:	"{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "secret webapp"
+    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+stringData:
diff --git a/deployment/kubernetes/templates/webapp/Service.yaml b/deployment/kubernetes/templates/webapp/Service.yaml
new file mode 100644
index 000000000..563a59693
--- /dev/null
+++ b/deployment/kubernetes/templates/webapp/Service.yaml
@@ -0,0 +1,20 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/name:	"{{ .Chart.Name }}"
+    app.kubernetes.io/instance:	"{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "service webapp"
+    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  ports:
+    - name: {{ .Release.Name }}-http
+      port: 3000
+      targetPort: 3000
+      protocol: TCP
+  selector:
+    app: {{ .Release.Name }}-webapp