diff --git a/charts/openg2p-pbms-beneficiary-portal/values.yaml b/charts/openg2p-pbms-beneficiary-portal/values.yaml
index 725c031..0c6eeaf 100644
--- a/charts/openg2p-pbms-beneficiary-portal/values.yaml
+++ b/charts/openg2p-pbms-beneficiary-portal/values.yaml
@@ -53,8 +53,8 @@ service:
 
 image:
   registry: docker.io
-  repository: openg2p/openg2p-selfservice-api
-  tag: develop
+  repository: openg2p/openg2p-beneficiary-portal-api
+  tag: 1.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -310,8 +310,8 @@ selfserviceUi:
     externalTrafficPolicy: Cluster
   image:
     registry: docker.io
-    repository: openg2p/openg2p-selfservice-ui
-    tag: develop
+    repository: openg2p/openg2p-beneficiary-portal-ui
+    tag: 1.0
     pullPolicy: Always
     pullSecrets: []
   containerPort: 3000
diff --git a/charts/openg2p-pbms/values.yaml b/charts/openg2p-pbms/values.yaml
index 6ded3cf..61a4d06 100644
--- a/charts/openg2p-pbms/values.yaml
+++ b/charts/openg2p-pbms/values.yaml
@@ -20,7 +20,6 @@ global:
 
 odoo:
   enabled: true
-
   hostname: '{{ tpl .Values.global.pbmsAdminHostname $ }}'
 
   oidcIssuerUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}'