diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/values.yaml b/kubernetes/pnda/charts/dcae-pnda-bootstrap/values.yaml
index 17fb936..43f35b6 100644
--- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/values.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/values.yaml
@@ -32,7 +32,7 @@
 enabled: false
 
 pnda:
-  version: develop
+  version: release/5.0
   dataNodes: 2
   kafkaNodes: 1
   osUser: centos
@@ -72,7 +72,7 @@
 
 
 repository: pndareg.ctao6.net
-image: pnda-cli:develop
+image: onap/org.onap.dcaegen2.deployments.pnda-bootstrap-container:5.0.0
 pullPolicy: Always
 
 ## Persist data to a persitent volume
diff --git a/kubernetes/pnda/charts/dcae-pnda-mirror/values.yaml b/kubernetes/pnda/charts/dcae-pnda-mirror/values.yaml
index 38024b5..6f346b8 100644
--- a/kubernetes/pnda/charts/dcae-pnda-mirror/values.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-mirror/values.yaml
@@ -31,7 +31,7 @@
 # application image
 
 repository: pndareg.ctao6.net
-image: pnda-mirror:develop
+image: onap/org.onap.dcaegen2.deployments.pnda-mirror-container:5.0.0
 pullPolicy: Always
 
 # application configuration