diff --git a/Devops/docs/helm-ops.md b/Devops/docs/helm-ops.md
index 0cfce4586c..4f16a67a9c 100644
--- a/Devops/docs/helm-ops.md
+++ b/Devops/docs/helm-ops.md
@@ -50,7 +50,7 @@ Production:
 
 ```
 kubectl config use-context arn:aws:eks:us-east-2:972164494713:cluster/oneuptime-production
-helm upgrade -f ./HelmChart/public/oneuptime/values.yaml -f ./kubernetes/values-saas-production.yaml fi ./HelmChart/public/oneuptime
+helm upgrade -f ./HelmChart/public/oneuptime/values.yaml -f ./Kubernetes/values-saas-production.yaml fi ./HelmChart/public/oneuptime
 ```
 
 Use default values first and then use production values.
diff --git a/HelmChart/public/oneuptime/templates/api-docs.yaml b/HelmChart/public/oneuptime/templates/api-docs.yaml
index 19d80042f3..29fafa6e27 100644
--- a/HelmChart/public/oneuptime/templates/api-docs.yaml
+++ b/HelmChart/public/oneuptime/templates/api-docs.yaml
@@ -4,31 +4,31 @@
 ####################################
 
 {{- if .Values.saas.isSaasService }}
-###########-----ApiDocs------##############
+###########-----api-docs------##############
 
 # OneUptime API docs Deployment
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+    name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
     namespace: {{ $.Release.Namespace }}
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+        app: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
 spec:
     selector:
         matchLabels:
-            app: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+            app: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
     replicas: {{ $.Values.replicaCount }}
     template:
         metadata:
             labels:
-                app: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+                app: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
         spec:
             containers:
-                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "ApiDocs" .Values.image.tag }}
-                  name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "api-docs" .Values.image.tag }}
+                  name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
                   imagePullPolicy: {{ $.Values.image.pullPolicy }}
                   resources:
                     requests:
@@ -63,7 +63,7 @@ spec:
                   ports:
                       - containerPort: {{ $.Values.host.apiDocsPort }}
                         hostPort: {{ $.Values.host.apiDocsPort }}
-                        name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+                        name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
             restartPolicy: {{ $.Values.image.restartPolicy }}
 
 ---
@@ -72,10 +72,10 @@ apiVersion: v1
 kind: Service
 metadata:
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+        app: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
-    name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+    name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
     namespace: {{ $.Release.Namespace }}
 spec:
     ports:
@@ -83,7 +83,7 @@ spec:
           protocol: TCP
           targetPort: {{ $.Values.host.apiDocsPort }}
     selector:
-        app: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+        app: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
     type: ClusterIP
 ---
 ###########################################
@@ -93,14 +93,14 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+  name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
 spec:
   maxReplicas: {{ $.Values.autoScaler.maxReplicas }}
   minReplicas: {{ $.Values.autoScaler.minReplicas }}
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+    name: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
   targetCPUUtilizationPercentage: {{ $.Values.autoScaler.averageCpuUtilization }}
 ---
 {{- end }}
\ No newline at end of file
diff --git a/HelmChart/public/oneuptime/templates/exposed-init-script.yaml b/HelmChart/public/oneuptime/templates/exposed-init-script.yaml
index 8f1754092c..81bd1abd30 100644
--- a/HelmChart/public/oneuptime/templates/exposed-init-script.yaml
+++ b/HelmChart/public/oneuptime/templates/exposed-init-script.yaml
@@ -4,30 +4,30 @@
 ####################################
 
 {{- if .Values.saas.exposeInitScriptContainer }}
-###########-----InitScript------#################
-# OneUptime InitScript
+###########-----init-script------#################
+# OneUptime init-script
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+    name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
     namespace: {{ $.Release.Namespace }}
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+        app: {{ printf "%s-%s" $.Release.Name "init-script"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
 spec:
     selector:
         matchLabels:
-            app: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+            app: {{ printf "%s-%s" $.Release.Name "init-script"  }}
     replicas: 1
     template:
         metadata:
             labels:
-                app: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+                app: {{ printf "%s-%s" $.Release.Name "init-script"  }}
         spec:
             containers:
-                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "InitScript" .Values.image.tag }}
-                  name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "init-script" .Values.image.tag }}
+                  name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
                   imagePullPolicy: {{ $.Values.image.pullPolicy }}
                   env:
                       - name: BILLING_ENABLED
@@ -59,7 +59,7 @@ spec:
                   ports:
                       - containerPort: {{ $.Values.host.initScriptPort }}
                         hostPort: {{ $.Values.host.initScriptPort }}
-                        name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+                        name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
             restartPolicy: {{ $.Values.image.restartPolicy }}
 
 ---
@@ -67,10 +67,10 @@ apiVersion: v1
 kind: Service
 metadata:
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+        app: {{ printf "%s-%s" $.Release.Name "init-script"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
-    name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+    name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
     namespace: {{ $.Release.Namespace }}
 spec:
     ports:
@@ -78,7 +78,7 @@ spec:
           protocol: TCP
           targetPort: {{ $.Values.host.initScriptPort }}
     selector:
-        app: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+        app: {{ printf "%s-%s" $.Release.Name "init-script"  }}
     type: ClusterIP
 ---
 ###########################################
diff --git a/HelmChart/public/oneuptime/templates/helm-chart.yaml b/HelmChart/public/oneuptime/templates/helm-chart.yaml
index b397a47e8b..a2b2576fe6 100644
--- a/HelmChart/public/oneuptime/templates/helm-chart.yaml
+++ b/HelmChart/public/oneuptime/templates/helm-chart.yaml
@@ -9,25 +9,25 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    name: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+    name: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
     namespace: {{ $.Release.Namespace }}
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+        app: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
 spec:
     selector:
         matchLabels:
-            app: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+            app: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
     replicas: {{ $.Values.replicaCount }}
     template:
         metadata:
             labels:
-                app: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+                app: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
         spec:
             containers:
-                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "HelmChart" .Values.image.tag }}
-                  name: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "helm-chart" .Values.image.tag }}
+                  name: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
                   imagePullPolicy: {{ $.Values.image.pullPolicy }}
                   resources:
                     requests:
@@ -70,10 +70,10 @@ apiVersion: v1
 kind: Service
 metadata:
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+        app: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
-    name: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+    name: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
     namespace: {{ $.Release.Namespace }}
 spec:
     ports:
@@ -81,7 +81,7 @@ spec:
           protocol: TCP
           targetPort: {{ $.Values.host.helmChartPort }}
     selector:
-        app: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+        app: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
     type: ClusterIP
 ---
 ###########################################
@@ -92,14 +92,14 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+  name: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
 spec:
   maxReplicas: {{ $.Values.autoScaler.maxReplicas }}
   minReplicas: {{ $.Values.autoScaler.minReplicas }}
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+    name: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
   targetCPUUtilizationPercentage: {{ $.Values.autoScaler.averageCpuUtilization }}
 ---
 {{- end }}
\ No newline at end of file
diff --git a/HelmChart/public/oneuptime/templates/ingress.yaml b/HelmChart/public/oneuptime/templates/ingress.yaml
index 2bb531015b..c8250db291 100644
--- a/HelmChart/public/oneuptime/templates/ingress.yaml
+++ b/HelmChart/public/oneuptime/templates/ingress.yaml
@@ -42,9 +42,9 @@ spec:
             backend:
               serviceName: {{ printf "%s-%s" $.Release.Name "ingestor"  }}
               servicePort: 80
-          - path: /ProbeAPI
+          - path: /probe-api
             backend:
-              serviceName: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+              serviceName: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
               servicePort: 80
           - path: /dashboard
             backend:
@@ -99,7 +99,7 @@ spec:
               servicePort: 80
           - path: /docs
             backend:
-              serviceName: {{ printf "%s-%s" $.Release.Name "ApiDocs"  }}
+              serviceName: {{ printf "%s-%s" $.Release.Name "api-docs"  }}
               servicePort: 80
           - path: /license
             backend:
@@ -107,7 +107,7 @@ spec:
               servicePort: 80
           - path: /chart
             backend:
-              serviceName: {{ printf "%s-%s" $.Release.Name "HelmChart"  }}
+              serviceName: {{ printf "%s-%s" $.Release.Name "helm-chart"  }}
               servicePort: 80
           {{- else }}
           - path: /
@@ -118,7 +118,7 @@ spec:
           {{- if $.Values.saas.exposeInitScriptContainer }}
           - path: /
             backend:
-              serviceName: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+              serviceName: {{ printf "%s-%s" $.Release.Name "init-script"  }}
               servicePort: 80
           {{- end }}   
 ---
diff --git a/HelmChart/public/oneuptime/templates/init-script.yaml b/HelmChart/public/oneuptime/templates/init-script.yaml
index a4a7b94af2..5f6f4dc99c 100644
--- a/HelmChart/public/oneuptime/templates/init-script.yaml
+++ b/HelmChart/public/oneuptime/templates/init-script.yaml
@@ -1,8 +1,8 @@
-########-InitScript-##########
+########-init-script-##########
 apiVersion: batch/v1
 kind: Job
 metadata:
-    name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+    name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
     namespace: {{ $.Release.Namespace }}
     labels:
       app.kubernetes.io/part-of: oneuptime
@@ -11,8 +11,8 @@ spec:
     template:
         spec:
             containers:
-                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "InitScript" .Values.image.tag }}
-                  name: {{ printf "%s-%s" $.Release.Name "InitScript"  }}
+                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "init-script" .Values.image.tag }}
+                  name: {{ printf "%s-%s" $.Release.Name "init-script"  }}
                   imagePullPolicy: {{ $.Values.image.pullPolicy }}
                   env:
                       - name: NODE_NAME
diff --git a/HelmChart/public/oneuptime/templates/probe-api.yaml b/HelmChart/public/oneuptime/templates/probe-api.yaml
index 7b5e3e8424..29aa671e11 100644
--- a/HelmChart/public/oneuptime/templates/probe-api.yaml
+++ b/HelmChart/public/oneuptime/templates/probe-api.yaml
@@ -1,32 +1,32 @@
-###########-----ProbeAPI------##############
+###########-----probe-api------##############
 
 # OneUptime Backend Deployment
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+    name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
     namespace: {{ $.Release.Namespace }}
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+        app: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
         {{- if $.Values.saas.isRunningOnGCPMarketplace }}
         app.kubernetes.io/name: "$name"
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/component:  {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+        app.kubernetes.io/component:  {{ printf "%s-%s" $.Release.Name "probe-api"  }}
         {{- end }}
 spec:
     selector:
         matchLabels:
-            app: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+            app: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
     replicas: {{ $.Values.replicaCount }}
     template:
         metadata:
             labels:
-                app: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+                app: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
         spec:
             containers:
-                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "ProbeAPI" .Values.image.tag }}
-                  name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+                - image: {{ printf "%s/%s/%s:%s" .Values.image.registry .Values.image.repository "probe-api" .Values.image.tag }}
+                  name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
                   imagePullPolicy: {{ $.Values.image.pullPolicy }}
                   resources:
                     requests:
@@ -66,9 +66,9 @@ spec:
                       - name: ONEUPTIME_HOST
                         value: {{ $.Values.oneuptime.hosts.host1.host }}
                       - name: DEPLOYMENT_NAME
-                        value: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+                        value: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
                       - name: CONTAINER_NAME
-                        value: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+                        value: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
                       - name: BACKEND_PROTOCOL
                         value: {{ $.Values.backendProtocol }}
                       - name: PORT
@@ -82,7 +82,7 @@ spec:
                   ports:
                       - containerPort: {{ $.Values.host.fetchResourcesPort }}
                         hostPort: {{ $.Values.host.fetchResourcesPort }}
-                        name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+                        name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
                 {{- if $.Values.saas.isRunningOnGCPMarketplace }}
                 - name: ubbagent
                   image: $imageUbbagent
@@ -121,17 +121,17 @@ apiVersion: v1
 kind: Service
 metadata:
     labels:
-        app: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+        app: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
         app.kubernetes.io/part-of: oneuptime
         app.kubernetes.io/managed-by: Helm
-    name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+    name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
     namespace: {{ $.Release.Namespace }}
 spec:
     ports:
         - port: {{ $.Values.host.fetchResourcesServicePort }}
           targetPort: {{ $.Values.host.fetchResourcesPort }}
     selector:
-        app: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+        app: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
     type: ClusterIP
 ---
 ##################################################
@@ -140,14 +140,14 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+  name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
 spec:
   maxReplicas: {{ $.Values.autoScaler.maxReplicas }}
   minReplicas: {{ $.Values.autoScaler.minReplicas }}
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ printf "%s-%s" $.Release.Name "ProbeAPI"  }}
+    name: {{ printf "%s-%s" $.Release.Name "probe-api"  }}
   targetCPUUtilizationPercentage: {{ $.Values.autoScaler.averageCpuUtilization }}
 ---
 {{- end }}
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 3dcc651e20..50e432e4c3 100755
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@ sudo docker compose pull
 
 
 # Create database if it does not exists
-sudo docker compose up -d postgres && sleep 30 && sudo docker compose exec postgres psql postgresql://$DATABASE_USERNAME:$DATABASE_PASSWORD@localhost:5400/postgres -c 'CREATE DATABASE oneuptimedb' || echo "Database created" 
+sudo docker compose up -d postgres && sleep 30 && sudo docker compose exec postgres psql postgresql://$DATABASE_USERNAME:$DATABASE_PASSWORD@localhost:5432/postgres -c 'CREATE DATABASE oneuptimedb' || echo "Database created" 
 
 # echo "Checking if async migrations are up to date"
 # sudo -E docker compose run init