diff --git a/helm-charts/infisical/Chart.yaml b/helm-charts/infisical/Chart.yaml
index 97fca592e..046fdd1f0 100644
--- a/helm-charts/infisical/Chart.yaml
+++ b/helm-charts/infisical/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # 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.3.5
+version: 0.4.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
diff --git a/helm-charts/infisical/templates/NOTES.txt b/helm-charts/infisical/templates/NOTES.txt
index 103ec9a5b..a5f3cd005 100644
--- a/helm-charts/infisical/templates/NOTES.txt
+++ b/helm-charts/infisical/templates/NOTES.txt
@@ -2,34 +2,6 @@
 
 -- Infisical Helm Chart --
 
-              __                  __
-             ( _)                ( _)
-            / / \\              / /\_\_
-           / /   \\            / / | \ \
-          / /     \\          / /  |\ \ \
-         /  /   ,  \ ,       / /   /|  \ \
-        /  /    |\_ /|      / /   / \   \_\
-       /  /  |\/ _ '_|\    / /   /   \    \\
-      |  /   |/   0 \0\\  / |    |    \    \\
-      |    |\|      \_\_ /  /    |     \    \\
-      |  | |/    \.\ o\o)  /      \     |    \\
-      \    |     /\\`v-v  /        |    |     \\
-       | \/    /_| \\_|  /         |    | \    \\
-       | |    /__/_     /   _____  |    |  \    \\
-       \|    [__]  \_/  |_________  \   |   \    ()
-        /    [___] (    \         \  |\ |   |   //
-       |    [___]                  |\| \|   /  |/
-      /|    [____]                  \  |/\ / / ||
-     (  \   [____ /     ) _\      \  \    \| | ||
-      \  \  [_____|    / /     __/    \   / / //
-      |   \ [_____/   / /        \    |   \/ //
-      |   /  '----|   /=\____   _/    |   / //
-   __ /  /        |  /   ___/  _/\    \  | ||
-  (/-(/-\)       /   \  (/\/\)/  |    /  | /
-                (/\/\)           /   /   //
-                       _________/   /    /
-                      \____________/    (
-
 ██╗███╗   ██╗███████╗██╗███████╗██╗ ██████╗ █████╗ ██╗     
 ██║████╗  ██║██╔════╝██║██╔════╝██║██╔════╝██╔══██╗██║     
 ██║██╔██╗ ██║█████╗  ██║███████╗██║██║     ███████║██║     
@@ -46,7 +18,6 @@
 │   Visit < https://infisical.com/docs/self-hosting/overview > for further documentation about self-hosting!
 │
 │   Current installation (infisical) :
-│   • infisical-frontend : {{ .Values.frontend.enabled }}
 │   • infisical-backend  : {{ .Values.backend.enabled }}
 │   • mongodb            : {{ .Values.mongodb.enabled }}
 │   • mailhog            : {{ .Values.mailhog.enabled }}
diff --git a/helm-charts/infisical/templates/_helpers.tpl b/helm-charts/infisical/templates/_helpers.tpl
index 500edea33..40180896f 100644
--- a/helm-charts/infisical/templates/_helpers.tpl
+++ b/helm-charts/infisical/templates/_helpers.tpl
@@ -41,16 +41,6 @@ component: {{ .Values.backend.name | quote }}
 {{ include "infisical.common.matchLabels" . }}
 {{- end -}}
 
-{{- define "infisical.frontend.labels" -}}
-{{ include "infisical.frontend.matchLabels" . }}
-{{ include "infisical.common.metaLabels" . }}
-{{- end -}}
-
-{{- define "infisical.frontend.matchLabels" -}}
-component: {{ .Values.frontend.name | quote }}
-{{ include "infisical.common.matchLabels" . }}
-{{- end -}}
-
 {{- define "infisical.mongodb.labels" -}}
 {{ include "infisical.mongodb.matchLabels" . }}
 {{ include "infisical.common.metaLabels" . }}
@@ -78,22 +68,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
-{{/*
-Create a fully qualified frontend name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "infisical.frontend.fullname" -}}
-{{- if .Values.frontend.fullnameOverride -}}
-{{- .Values.frontend.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.frontend.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.frontend.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
 
 {{/*
 Create a fully qualified mongodb name.
diff --git a/helm-charts/infisical/templates/backend-deployment.yaml b/helm-charts/infisical/templates/backend-deployment.yaml
index 86c00c1bc..0c7f3c903 100644
--- a/helm-charts/infisical/templates/backend-deployment.yaml
+++ b/helm-charts/infisical/templates/backend-deployment.yaml
@@ -36,17 +36,17 @@ spec:
         readinessProbe:
           httpGet:
             path: /api/status
-            port: 4000
-          initialDelaySeconds: 10
-          periodSeconds: 10
+            port: 8080
+          initialDelaySeconds: 50
+          periodSeconds: 30
         ports: 
-        - containerPort: 4000
+        - containerPort: 8080
         envFrom:
         - secretRef:
             name: {{ $backend.kubeSecretRef | default (include "infisical.backend.fullname" .) }}
-        {{- if  $backend.resources }}
-        resources: {{- toYaml $backend.resources | nindent 12 }}
-        {{- end }}
+        # {{- if  $backend.resources }}
+        # resources: {{- toYaml $backend.resources | nindent 12 }}
+        # {{- end }}
 ---
 
 apiVersion: v1
@@ -65,8 +65,8 @@ spec:
     {{- include "infisical.backend.matchLabels" . | nindent 8 }}
   ports:
     - protocol: TCP
-      port: 4000
-      targetPort: 4000 # container port 
+      port: 8080
+      targetPort: 8080 # container port 
       {{- if eq $backend.service.type "NodePort" }}
       nodePort: {{ $backend.service.nodePort }}
       {{- end }}
diff --git a/helm-charts/infisical/templates/frontend-deployment.yaml b/helm-charts/infisical/templates/frontend-deployment.yaml
deleted file mode 100644
index 043a94263..000000000
--- a/helm-charts/infisical/templates/frontend-deployment.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-{{- $frontend := .Values.frontend }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "infisical.frontend.fullname" . }}
-  annotations:
-    updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }}
-  {{- with .Values.frontend.deploymentAnnotations }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "infisical.frontend.labels" . | nindent 4 }}
-spec:
-  replicas: {{ $frontend.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "infisical.frontend.matchLabels" . | nindent 6 }}
-  template:
-    metadata: 
-      labels:
-        {{- include "infisical.frontend.matchLabels" . | nindent 8 }}
-      annotations:
-        updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }}
-        {{- with $frontend.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-    {{- with $frontend.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: {{ template "infisical.name" . }}-{{ $frontend.name }}
-        image: "{{ $frontend.image.repository }}:{{ $frontend.image.tag | default "latest" }}"
-        imagePullPolicy: {{ $frontend.image.pullPolicy }}
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 3000
-          initialDelaySeconds: 10
-          periodSeconds: 10
-        envFrom:
-        - secretRef:
-            name: {{ $frontend.kubeSecretRef | default (include "infisical.frontend.fullname" .)  }}
-        ports: 
-        - containerPort: 3000
-        {{- if  $frontend.resources }}
-        resources: {{- toYaml $frontend.resources | nindent 12 }}
-        {{- end }}
----
-
-apiVersion: v1
-kind: Service 
-metadata:
-  name: {{ include "infisical.frontend.fullname" . }}
-  labels:
-    {{- include "infisical.frontend.labels" . | nindent 4 }}
-  {{- with $frontend.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ $frontend.service.type }}
-  selector:
-    {{- include "infisical.frontend.matchLabels" . | nindent 8 }}
-  ports:
-    - protocol: TCP
-      port: 3000 # service
-      targetPort: 3000 # container port 
-      {{- if eq $frontend.service.type "NodePort" }}
-      nodePort: {{ $frontend.service.nodePort }}
-      {{- end }}
-
----
-
-{{ if not $frontend.kubeSecretRef }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "infisical.frontend.fullname" . }}
-  annotations:
-    "helm.sh/resource-policy": "keep"
-type: Opaque
-stringData:
-  {{- $requiredVars := dict }}
-  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace (include "infisical.frontend.fullname" .)) | default dict }}
-  {{- $secretData := (get $secretObj "data") | default dict }}
-  {{ range $key, $value := .Values.frontendEnvironmentVariables }}
-    {{- $default := get $requiredVars $key -}}
-    {{- $current := get $secretData $key | b64dec -}}
-    {{- $v := $value | default ($current | default $default) -}}
-    {{ $key }}: {{ $v | quote }}
-  {{ end -}}
-{{- end }}
\ No newline at end of file
diff --git a/helm-charts/infisical/templates/ingress.yaml b/helm-charts/infisical/templates/ingress.yaml
index 659948510..ab5253ca6 100644
--- a/helm-charts/infisical/templates/ingress.yaml
+++ b/helm-charts/infisical/templates/ingress.yaml
@@ -30,27 +30,20 @@ spec:
   rules:
     - http:
         paths:
-        - path: {{ $ingress.frontend.path }}
-          pathType: {{ $ingress.frontend.pathType }}
-          backend:
-            service:
-              name: {{ include "infisical.frontend.fullname" . }}
-              port:
-                number: 3000
-        - path: {{ $ingress.backend.path }}
-          pathType: {{ $ingress.backend.pathType }}
+        - path: /
+          pathType: Prefix
           backend:
             service:
               name: {{ include "infisical.backend.fullname" . }}
               port:
-                number: 4000
+                number: 8080
         - path: /ss-webhook
           pathType: Exact
           backend:
             service:
               name: {{ include "infisical.backend.fullname" . }}
               port:
-                number: 4000
+                number: 8080
       {{- if $ingress.hostName }}
       host: {{ $ingress.hostName }}
       {{- end }}
diff --git a/helm-charts/infisical/values.yaml b/helm-charts/infisical/values.yaml
index 12706c56b..70fca908d 100644
--- a/helm-charts/infisical/values.yaml
+++ b/helm-charts/infisical/values.yaml
@@ -8,76 +8,6 @@ nameOverride: ""
 ##
 fullnameOverride: ""
 
-## @section Infisical frontend parameters
-## Documentation : https://infisical.com/docs/self-hosting/deployments/kubernetes
-##
-
-frontend:
-  ## @param frontend.enabled Enable frontend
-  ##
-  enabled: true
-  ## @param frontend.name Frontend name
-  ##
-  name: frontend
-  ## @param frontend.fullnameOverride Frontend fullnameOverride
-  ##
-  fullnameOverride: ""
-  ## @param frontend.podAnnotations Frontend pod annotations
-  ##
-  podAnnotations: {}
-  ## @param frontend.deploymentAnnotations Frontend deployment annotations
-  ##
-  deploymentAnnotations: {}
-  ## @param frontend.replicaCount Frontend replica count
-  ##
-  replicaCount: 2
-  ## Frontend image parameters
-  ##
-  image:
-    ## @param frontend.image.repository Frontend image repository
-    ##
-    repository: infisical/frontend
-    ## @param frontend.image.tag Frontend image tag
-    ##
-    tag: "latest"
-    ## @param frontend.image.pullPolicy Frontend image pullPolicy
-    ##
-    pullPolicy: IfNotPresent
-  ## @param frontend.resources.limits.memory container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
-  ## @param frontend.resources.requests.cpu container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
-  ##
-  resources:
-    limits:
-      memory: 100Mi
-    requests:
-      cpu: 100m
-  ## @param frontend.affinity Frontend pod affinity
-  ##
-  affinity: {}
-  ## @param frontend.kubeSecretRef Backend secret resource reference name (containing required [frontend configuration variables](https://infisical.com/docs/self-hosting/configuration/envars))
-  ##
-  kubeSecretRef: ""
-  ## Frontend service
-  ##
-  service:
-    ## @param frontend.service.annotations Backend service annotations
-    ##
-    annotations: {}
-    ## @param frontend.service.type Backend service type
-    ##
-    type: ClusterIP
-    ## @param frontend.service.nodePort Backend service nodePort (used if above type is `NodePort`)
-    ##
-    nodePort: ""
-
-## Frontend variables configuration
-## Documentation : https://infisical.com/docs/self-hosting/configuration/envars
-##
-frontendEnvironmentVariables:
-  ## @param frontendEnvironmentVariables.SITE_URL Absolute URL including the protocol (e.g. https://app.infisical.com)
-  ##
-  SITE_URL: infisical.local
-
 ## @section Infisical backend parameters
 ## Documentation : https://infisical.com/docs/self-hosting/deployments/kubernetes
 ##
@@ -106,21 +36,13 @@ backend:
   image:
     ## @param backend.image.repository Backend image repository
     ##
-    repository: infisical/backend
+    repository: infisical/infisical
     ## @param backend.image.tag Backend image tag
     ##
     tag: "latest"
     ## @param backend.image.pullPolicy Backend image pullPolicy
     ##
     pullPolicy: IfNotPresent
-  ## @param backend.resources.limits.memory container memory limit [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
-  ## @param backend.resources.requests.cpu container CPU request [check the offical kubernetes documentations](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
-  ##
-  resources:
-    limits:
-      memory: 200Mi
-    requests:
-      cpu: 150m
   ## @param backend.affinity Backend pod affinity
   ##
   affinity: {}
@@ -349,16 +271,6 @@ ingress:
   ## Replace with your own domain
   ##
   hostName: ""
-  ## @skip ingress.frontend
-  ##
-  frontend:
-    path: /
-    pathType: Prefix
-  ## @skip ingress.backend
-  ##
-  backend:
-    path: /api
-    pathType: Prefix
   ## @param ingress.tls Ingress TLS hosts (matching above hostName)
   ## Replace with your own domain
   ##