diff --git a/helm/pgwatch/templates/secrets.yaml b/helm/pgwatch/templates/secrets.yaml
new file mode 100644
index 0000000..b92889b
--- /dev/null
+++ b/helm/pgwatch/templates/secrets.yaml
@@ -0,0 +1,22 @@
+{{- if eq .Values.pgwatch.postgres.create_metric_database "true" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: pgwatch-postgresql-secret-postgres
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  username: cG9zdGdyZXM=  
+  password: YmVlRit1MWJvaGNlNXhpZVphYW1haENoZWkzdXRodT4= 
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: pgwatch-postgresql-secret-pgwatch
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  username: cGd3YXRjaA==   
+  password: YXdhZXM2b2hSMWRlZTJpZWRvbzFuMEFvMmxpZTNMZS0=  
+{{ end }}
diff --git a/helm/pgwatch/values.yaml b/helm/pgwatch/values.yaml
new file mode 100644
index 0000000..5d884c0
--- /dev/null
+++ b/helm/pgwatch/values.yaml
@@ -0,0 +1,53 @@
+pgwatch:
+  # pgwatch image, now using lightweight Alpine variant for faster startup
+  image: "docker.io/cybertecpostgresql/pgwatch:1.18.0-alpine"
+  namespace: pgwatch
+
+  postgres:
+    enable_pg_sink: "true"
+    settings: 
+      retention_days: 31
+    # define if a database for the metrics needs to be created or if there is already an existing database
+    create_metric_database: "true" #"false"
+    new_pg_database: # Will be used for pgwatch config only, if enable_pg_sink = "false"
+      # Postgres image now using Alpine variant
+      image: "docker.io/library/postgres:17.4-alpine"   
+      volume:
+        size: '10Gi'
+        storageClass: 'crc-csi-hostpath-provisioner'
+
+    # Base64-encoded credentials (to match secrets.yaml)
+    credentials:
+      usernameSecretName: pgwatch-postgresql-secret-pgwatch
+      usernameSecretKey: username
+      passwordSecretName: pgwatch-postgresql-secret-pgwatch
+      passwordSecretKey: password
+
+    # use_existing_database: # Will be used for pgwatch config only, if enable_pg_sink = "false"
+    #   endpoint: postgresql.local
+    #   port:     '5432'
+    #   database: PGWATCH_DATABASE
+    #   sslmode:  require
+    #   username: pgwatch_user
+    #   password: PASSWORD_FOR_PGWATCH_USER
+
+  prometheus: 
+    enable_prom_sink: "true"
+    new_prometheus:
+      create_prometheus: "false"
+      create_alertmanager: "false"
+      # Prometheus Alpine image for faster deployment
+      image: "prom/prometheus:v2.47.0-alpine" 
+      settings:
+        retention_days: 31
+      volume:
+        size: '10Gi'
+        storageClass: 'crc-csi-hostpath-provisioner'
+
+  grafana:
+    enable_grafana: "true"
+    # Grafana Alpine image
+    image: "grafana/grafana:10.1.1-alpine"   
+    enable_datasources:
+      postgres: "true"
+      prometheus: "false"