diff --git a/chart/edb-cnp-gke-autopilot/.helmignore b/chart/edb-cnpg-gke-autopilot/.helmignore
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/.helmignore
rename to chart/edb-cnpg-gke-autopilot/.helmignore
diff --git a/chart/edb-cnpg-gke-autopilot/Chart.yaml b/chart/edb-cnpg-gke-autopilot/Chart.yaml
new file mode 100644
index 0000000..3ba59ba
--- /dev/null
+++ b/chart/edb-cnpg-gke-autopilot/Chart.yaml
@@ -0,0 +1,3 @@
+engine: gotpl
+name: edb-cnpg-gke-autopilot
+version: 1.0.0
\ No newline at end of file
diff --git a/chart/edb-cnp-gke-autopilot/configuration/deploy_info.json b/chart/edb-cnpg-gke-autopilot/configuration/deploy_info.json
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/configuration/deploy_info.json
rename to chart/edb-cnpg-gke-autopilot/configuration/deploy_info.json
diff --git a/chart/edb-cnp-gke-autopilot/configuration/description.md b/chart/edb-cnpg-gke-autopilot/configuration/description.md
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/configuration/description.md
rename to chart/edb-cnpg-gke-autopilot/configuration/description.md
diff --git a/chart/edb-cnp-gke-autopilot/configuration/icon_200px.png b/chart/edb-cnpg-gke-autopilot/configuration/icon_200px.png
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/configuration/icon_200px.png
rename to chart/edb-cnpg-gke-autopilot/configuration/icon_200px.png
diff --git a/chart/edb-cnp-gke-autopilot/configuration/links.yaml b/chart/edb-cnpg-gke-autopilot/configuration/links.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/configuration/links.yaml
rename to chart/edb-cnpg-gke-autopilot/configuration/links.yaml
diff --git a/chart/edb-cnp-gke-autopilot/configuration/notes.md b/chart/edb-cnpg-gke-autopilot/configuration/notes.md
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/configuration/notes.md
rename to chart/edb-cnpg-gke-autopilot/configuration/notes.md
diff --git a/chart/edb-cnp-gke-autopilot/requirements.lock b/chart/edb-cnpg-gke-autopilot/requirements.lock
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/requirements.lock
rename to chart/edb-cnpg-gke-autopilot/requirements.lock
diff --git a/chart/edb-cnp-gke-autopilot/requirements.yaml b/chart/edb-cnpg-gke-autopilot/requirements.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/requirements.yaml
rename to chart/edb-cnpg-gke-autopilot/requirements.yaml
diff --git a/chart/edb-cnp-gke-autopilot/templates/application.yaml b/chart/edb-cnpg-gke-autopilot/templates/application.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/templates/application.yaml
rename to chart/edb-cnpg-gke-autopilot/templates/application.yaml
diff --git a/chart/edb-cnp-gke-autopilot/templates/metering-configmap.yaml b/chart/edb-cnpg-gke-autopilot/templates/metering-configmap.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/templates/metering-configmap.yaml
rename to chart/edb-cnpg-gke-autopilot/templates/metering-configmap.yaml
diff --git a/chart/edb-cnp-gke-autopilot/templates/metering-deployment.yaml b/chart/edb-cnpg-gke-autopilot/templates/metering-deployment.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/templates/metering-deployment.yaml
rename to chart/edb-cnpg-gke-autopilot/templates/metering-deployment.yaml
diff --git a/chart/edb-cnp-gke-autopilot/templates/metering-service.yaml b/chart/edb-cnpg-gke-autopilot/templates/metering-service.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/templates/metering-service.yaml
rename to chart/edb-cnpg-gke-autopilot/templates/metering-service.yaml
diff --git a/chart/edb-cnp-gke-autopilot/templates/ubbagent-configmap.yaml b/chart/edb-cnpg-gke-autopilot/templates/ubbagent-configmap.yaml
similarity index 100%
rename from chart/edb-cnp-gke-autopilot/templates/ubbagent-configmap.yaml
rename to chart/edb-cnpg-gke-autopilot/templates/ubbagent-configmap.yaml
diff --git a/chart/edb-cnpg-gke-autopilot/values.yaml b/chart/edb-cnpg-gke-autopilot/values.yaml
new file mode 100644
index 0000000..df4ee71
--- /dev/null
+++ b/chart/edb-cnpg-gke-autopilot/values.yaml
@@ -0,0 +1,69 @@
+cloudnative-pg:
+  podLabels:
+    app: edb-cnpg-gke-autopilot
+  serviceAccount:
+    create: false
+  rbac:
+    create: false
+  webhook:
+    livenessProbe:
+      initialDelaySeconds: 30
+    readinessProbe:
+      initialDelaySeconds: 30
+metering:
+  image:
+    image: "metering_image_repo:latest"
+    pullPolicy: IfNotPresent
+  reporting:
+    metricName: "edb_usage_2"
+    serviceName: "edb-postgresql.endpoints.public-edb-ppas.cloud.goog"
+    scheme: "http"
+    host: "localhost"
+    port: "4567"
+    path: "/report"
+    status: "/status"
+    interval: "1m"
+    unit: "1h"
+    type: "double"
+  stateConfigMapName: "metering-state"
+  ubbImage:
+    image: "gcr.io/cloud-marketplace-tools/metering/ubbagent:latest"
+    pullPolicy: IfNotPresent
+  reportingSecret: ""
+  labels:
+    app: edb-cnpg-gke-autopilot-metering
+  secretName: ""
+  serviceAccountName: ""
+  podSecurityContext:
+    runAsNonRoot: false
+    seccompProfile:
+      type: RuntimeDefault
+  http:
+    port: 5678
+    readinessProbe:
+      path: /readyz
+      initialDelaySeconds: 15
+    livenessProbe:
+      path: /healthz
+      initialDelaySeconds: 15
+  service:
+    type: ClusterIP
+    port: 443
+  resources: { }
+    # If you want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    #
+    # limits:
+    #   cpu: 100m
+    #   memory: 200Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 100Mi
+  containerSecurityContext:
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    runAsUser: 10001
+    runAsGroup: 10001
+    capabilities:
+      drop:
+        - "ALL"