diff --git a/deployment/helm/Chart.lock b/deployment/helm/Chart.lock
deleted file mode 100644
index 53c759d..0000000
--- a/deployment/helm/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: eoapi
-  repository: https://devseed.com/eoapi-k8s/
-  version: 0.4.17
-digest: sha256:adbb8a0db399bf32efbf12ffafafbf07c6d4f676f78b2bf2aa6befdc5f1a4f51
-generated: "2024-10-16T11:33:15.655622351+02:00"
diff --git a/deployment/helm/charts/eoapi-0.4.17.tgz b/deployment/helm/charts/eoapi-0.4.17.tgz
deleted file mode 100644
index 3838039..0000000
Binary files a/deployment/helm/charts/eoapi-0.4.17.tgz and /dev/null differ
diff --git a/deployment/helm/debug.yaml b/deployment/helm/debug.yaml
new file mode 100644
index 0000000..3c7bd9c
--- /dev/null
+++ b/deployment/helm/debug.yaml
@@ -0,0 +1,106 @@
+---
+# Source: webapp-polder/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: test-webapp-polder
+  labels:
+    helm.sh/chart: webapp-polder-0.1.0
+    app.kubernetes.io/name: webapp-polder
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "0.1.0"
+    app.kubernetes.io/managed-by: Helm
+automountServiceAccountToken: true
+---
+# Source: webapp-polder/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: test-webapp-polder
+  labels:
+    helm.sh/chart: webapp-polder-0.1.0
+    app.kubernetes.io/name: webapp-polder
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "0.1.0"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: webapp-polder
+    app.kubernetes.io/instance: test
+---
+# Source: webapp-polder/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-webapp-polder
+  labels:
+    helm.sh/chart: webapp-polder-0.1.0
+    app.kubernetes.io/name: webapp-polder
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "0.1.0"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: webapp-polder
+      app.kubernetes.io/instance: test
+  template:
+    metadata:
+      labels:
+        helm.sh/chart: webapp-polder-0.1.0
+        app.kubernetes.io/name: webapp-polder
+        app.kubernetes.io/instance: test
+        app.kubernetes.io/version: "0.1.0"
+        app.kubernetes.io/managed-by: Helm
+    spec:
+      serviceAccountName: test-webapp-polder
+      securityContext:
+        {}
+      containers:
+        - name: webapp-polder
+          securityContext:
+            {}
+          image: "nginx:0.1.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {}
+---
+# Source: webapp-polder/templates/tests/test-connection.yaml
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "test-webapp-polder-test-connection"
+  labels:
+    helm.sh/chart: webapp-polder-0.1.0
+    app.kubernetes.io/name: webapp-polder
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "0.1.0"
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['test-webapp-polder:80']
+  restartPolicy: Never
diff --git a/deployment/helm/templates/Webapp.yml b/deployment/helm/templates/Webapp.yml
deleted file mode 100644
index 480e61b..0000000
--- a/deployment/helm/templates/Webapp.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.service.name }}
-  labels:
-    app: {{ .Values.service.name }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ .Values.service.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.service.name }}
-    spec:
-      containers:
-        - name: nginx
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          ports:
-            - containerPort: 80
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.service.name }}
-  labels:
-    app: {{ .Values.service.name }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: 8081
-      targetPort: 80
-  selector:
-    app: {{ .Values.service.name }}
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
deleted file mode 100644
index 20b397f..0000000
--- a/deployment/helm/values.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  tag: "1.27.2"
-
-service:
-  enabled: true
-  name: polder-webapp
-  type: NodePort
-  ports:
-    - port: 8081
-      targetPort: 80
-      nodePort: 30001
-  selector:
-    app: polder-webapp
-
-resources: {}
diff --git a/deployment/helm/webapp-polder/.helmignore b/deployment/helm/webapp-polder/.helmignore
new file mode 100644
index 0000000..0e8a0eb
--- /dev/null
+++ b/deployment/helm/webapp-polder/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/deployment/helm/Chart.yaml b/deployment/helm/webapp-polder/Chart.yaml
similarity index 50%
rename from deployment/helm/Chart.yaml
rename to deployment/helm/webapp-polder/Chart.yaml
index 1d25638..e398a3e 100644
--- a/deployment/helm/Chart.yaml
+++ b/deployment/helm/webapp-polder/Chart.yaml
@@ -1,21 +1,24 @@
 apiVersion: v2
-name: polder
-description: Create a polder - Web AOI viewer - instance.
+name: webapp-polder
+description: A Helm chart for Polder Web Application
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-kubeVersion: ">=1.23.0-0"
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.0.1"
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.1"
-
-dependencies:
-  - name: eoapi
-    version: 0.4.17
-    repository: "https://devseed.com/eoapi-k8s/"
+appVersion: "0.2.0"
diff --git a/deployment/helm/webapp-polder/templates/NOTES.txt b/deployment/helm/webapp-polder/templates/NOTES.txt
new file mode 100644
index 0000000..5c1ca9f
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "webapp-polder.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "webapp-polder.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "webapp-polder.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "webapp-polder.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
diff --git a/deployment/helm/webapp-polder/templates/_helpers.tpl b/deployment/helm/webapp-polder/templates/_helpers.tpl
new file mode 100644
index 0000000..9d8b79e
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webapp-polder.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webapp-polder.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webapp-polder.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "webapp-polder.labels" -}}
+helm.sh/chart: {{ include "webapp-polder.chart" . }}
+{{ include "webapp-polder.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "webapp-polder.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "webapp-polder.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "webapp-polder.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "webapp-polder.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/webapp-polder/templates/deployment.yaml b/deployment/helm/webapp-polder/templates/deployment.yaml
new file mode 100644
index 0000000..ccf0400
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/deployment.yaml
@@ -0,0 +1,68 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "webapp-polder.fullname" . }}
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "webapp-polder.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "webapp-polder.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "webapp-polder.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/deployment/helm/webapp-polder/templates/hpa.yaml b/deployment/helm/webapp-polder/templates/hpa.yaml
new file mode 100644
index 0000000..109749e
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "webapp-polder.fullname" . }}
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "webapp-polder.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/deployment/helm/webapp-polder/templates/ingress.yaml b/deployment/helm/webapp-polder/templates/ingress.yaml
new file mode 100644
index 0000000..ec44f6a
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/ingress.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "webapp-polder.fullname" . }}
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.ingress.className }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- with .pathType }}
+            pathType: {{ . }}
+            {{- end }}
+            backend:
+              service:
+                name: {{ include "webapp-polder.fullname" $ }}
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/deployment/helm/webapp-polder/templates/service.yaml b/deployment/helm/webapp-polder/templates/service.yaml
new file mode 100644
index 0000000..c5461b7
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "webapp-polder.fullname" . }}
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "webapp-polder.selectorLabels" . | nindent 4 }}
diff --git a/deployment/helm/webapp-polder/templates/serviceaccount.yaml b/deployment/helm/webapp-polder/templates/serviceaccount.yaml
new file mode 100644
index 0000000..10e945e
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "webapp-polder.serviceAccountName" . }}
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
diff --git a/deployment/helm/webapp-polder/templates/tests/test-connection.yaml b/deployment/helm/webapp-polder/templates/tests/test-connection.yaml
new file mode 100644
index 0000000..90588bf
--- /dev/null
+++ b/deployment/helm/webapp-polder/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "webapp-polder.fullname" . }}-test-connection"
+  labels:
+    {{- include "webapp-polder.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "webapp-polder.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/deployment/helm/webapp-polder/values.yaml b/deployment/helm/webapp-polder/values.yaml
new file mode 100644
index 0000000..ea97a29
--- /dev/null
+++ b/deployment/helm/webapp-polder/values.yaml
@@ -0,0 +1,123 @@
+# Default values for webapp-polder.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+replicaCount: 1
+
+# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
+image:
+  repository: ghcr.io/developmentseed/polder
+  # This sets the pull policy for images.
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "dev"
+
+# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
+# This is to override the chart name.
+nameOverride: ""
+fullnameOverride: ""
+
+#This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+# This is for setting Kubernetes Annotations to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ 
+podAnnotations: {}
+# This is for setting Kubernetes Labels to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/
+service:
+  # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+  type: ClusterIP
+  # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
+  port: 80
+
+# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+
+#This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deployment/k8s/deploy.yaml b/deployment/k8s/deploy.yaml
new file mode 100644
index 0000000..ef2f0a8
--- /dev/null
+++ b/deployment/k8s/deploy.yaml
@@ -0,0 +1,105 @@
+---
+# Extendable account (kind of a user) running the setup
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: test-polder
+  labels:
+    app.kubernetes.io/name: polder
+automountServiceAccountToken: true
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-polder-configmap
+data:
+  app_config.js: |
+    window.__APP_CONFIG__ = {
+        MAPBOX_TOKEN: "pk.eyJ1IjoiZGV2c2VlZCIsImEiOiJnUi1mbkVvIn0.018aLhX0Mb0tdtaT2QNe2Q",
+        STAC_API: "https://rx3hna9pbg.execute-api.eu-central-1.amazonaws.com",
+        TILER_API: "https://zbrrek3x0i.execute-api.eu-central-1.amazonaws.com",
+        PIPPO: "PLUTO"
+    };
+---
+# Public facing proxy
+apiVersion: v1
+kind: Service
+metadata:
+  name: test-polder
+  labels:
+    app.kubernetes.io/name: polder
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: polder
+---
+# Magic sauce. Defines the what in the template wrapped into a deployment manager
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-polder
+  labels:
+    app.kubernetes.io/name: polder
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: polder
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: polder
+    spec:
+      serviceAccountName: test-polder
+      securityContext:
+        {}
+      containers:
+        - name: polder
+          securityContext:
+            {}
+          image: "ghcr.io/developmentseed/polder:dev"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {}
+          volumeMounts:
+            - name: test-polder-config
+              mountPath: /usr/share/nginx/html/app_config.js
+              subPath: app_config.js
+      volumes:
+        - name: test-polder-config
+          configMap:
+            name: test-polder-configmap
+---
+# Simple pod to test whether the deployment is working successfully
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "test-polder-test-connection"
+  labels:
+    helm.sh/chart: polder-0.1.0
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['test-polder:80']
+  restartPolicy: Never
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 2189b0f..bb39a4a 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -8,4 +8,4 @@ RUN ls -la .
 
 FROM nginx:alpine
 COPY --from=build /src/dist /usr/share/nginx/html
-EXPOSE 8080
+EXPOSE 80