diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
index 57b08cb4b3..9fcbfab711 100644
--- a/HelmChart/Public/oneuptime/templates/_helpers.tpl
+++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -74,15 +74,24 @@
   value: {{ printf "true" | squote }}
 
 - name: ONEUPTIME_SECRET
+  {{- if $.Values.oneuptimeSecret }}
+  value: {{ $.Values.oneuptimeSecret }}
+  {{- else }}
   valueFrom:
     secretKeyRef:
       name: {{ printf "%s-%s" $.Release.Name "secrets"  }}
       key: oneuptime-secret
+  {{- end }}
+  
 - name: ENCRYPTION_SECRET
+  {{- if $.Values.encryptionSecret }}.
+  value: {{ $.Values.encryptionSecret }}
+  {{- else }}
   valueFrom:
     secretKeyRef:
       name: {{ printf "%s-%s" $.Release.Name "secrets"  }}
       key: encryption-secret
+  {{- end }}
 
 - name: CLICKHOUSE_USER
   value: {{ $.Values.clickhouse.auth.username }}
diff --git a/HelmChart/Public/oneuptime/templates/probe.yaml b/HelmChart/Public/oneuptime/templates/probe.yaml
index b3e29a3d7e..f6d4999cf7 100644
--- a/HelmChart/Public/oneuptime/templates/probe.yaml
+++ b/HelmChart/Public/oneuptime/templates/probe.yaml
@@ -37,10 +37,14 @@ spec:
             - name: PROBE_MONITORING_WORKERS
               value: {{ $val.monitoringWorkers | squote }}
             - name: PROBE_KEY
+              {{- if $val.key }}
+              value: {{ $val.key }}
+              {{- else }}
               valueFrom:
                 secretKeyRef:
                   name: {{ printf "%s-%s" $.Release.Name "secrets"  }}
                   key: {{printf "probe-%s" $key}}
+              {{- end }}
             - name: PROBE_MONITOR_FETCH_LIMIT
               value: {{ $val.monitorFetchLimit | squote }}
             - name: ONEUPTIME_SECRET
diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
index 1f6bda8659..c88dcbf383 100644
--- a/HelmChart/Public/oneuptime/values.yaml
+++ b/HelmChart/Public/oneuptime/values.yaml
@@ -7,6 +7,10 @@ global:
 host: localhost
 httpProtocol: http
 
+# (Optional): You usually do not need to set this if you're self hosting. If you do set it, set it to a long random value.
+oneuptimeSecret: 
+encryptionSecret: 
+
 # (Optional): You usually do not need to set this if you're self hosting. 
 openTelemetryCollectorHost:
 fluentdHost: 
@@ -124,11 +128,13 @@ probes:
     description: "Probe"
     monitoringWorkers: 3
     monitorFetchLimit: 10
+    key: 
   # two: 
   #   name: "Probe 2"
   #   description: "Probe 2"
   #   monitoringWorkers: 3
   #   monitorFetchLimit: 10
+  #   key:
 
 port: 
   app: 3002
diff --git a/restore.sh b/restore.sh
index 4035961b8a..d9cc066e3e 100644
--- a/restore.sh
+++ b/restore.sh
@@ -21,5 +21,4 @@ sudo docker run --net=host --rm \
 --volume=$(pwd)$DATABASE_RESTORE_DIRECTORY:/var/lib/postgresql/data \
 postgres:latest /usr/bin/pg_restore --dbname=postgresql://$DATABASE_RESTORE_USERNAME:$DATABASE_RESTORE_PASSWORD@$DATABASE_RESTORE_HOST:$DATABASE_RESTORE_PORT/$DATABASE_RESTORE_NAME /var/lib/postgresql/data/$DATABASE_RESTORE_FILENAME
 
-
 echo "Restore Completed"
\ No newline at end of file