diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 9ee7195..3ffac1a 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -83,7 +83,7 @@
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-6"
+    charm: "cs:~charmed-osm/nbi-8"
     scale: 3
     series: kubernetes
     options:
@@ -94,7 +94,7 @@
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-1"
+    charm: "cs:~charmed-osm/ro-3"
     scale: 3
     series: kubernetes
     options:
@@ -103,14 +103,14 @@
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-17"
+    charm: "cs:~charmed-osm/ng-ui-19"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-2"
+    charm: "cs:~charmed-osm/lcm-4"
     scale: 3
     series: kubernetes
     options:
@@ -120,7 +120,7 @@
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-2"
+    charm: "cs:~charmed-osm/mon-4"
     scale: 1
     series: kubernetes
     options:
@@ -131,7 +131,7 @@
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-1"
+    charm: "cs:~charmed-osm/pol-3"
     scale: 3
     series: kubernetes
     options:
@@ -140,7 +140,7 @@
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-7"
+    charm: "cs:~charmed-osm/pla-8"
     scale: 3
     series: kubernetes
     options:
@@ -149,7 +149,7 @@
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-1"
+    charm: "cs:~charmed-osm/prometheus-2"
     scale: 1
     series: kubernetes
     storage:
@@ -160,14 +160,14 @@
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-1"
+    charm: "cs:~charmed-osm/grafana-2"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-5"
+    charm: "cs:~charmed-osm/keystone-7"
     scale: 1
     series: kubernetes
     annotations:
diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 404ed56..cd3a2a6 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -76,7 +76,7 @@
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-6"
+    charm: "cs:~charmed-osm/nbi-8"
     scale: 1
     series: kubernetes
     options:
@@ -87,7 +87,7 @@
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-1"
+    charm: "cs:~charmed-osm/ro-3"
     scale: 1
     series: kubernetes
     options:
@@ -96,14 +96,14 @@
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-17"
+    charm: "cs:~charmed-osm/ng-ui-19"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-2"
+    charm: "cs:~charmed-osm/lcm-4"
     scale: 1
     series: kubernetes
     options:
@@ -113,7 +113,7 @@
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-2"
+    charm: "cs:~charmed-osm/mon-4"
     scale: 1
     series: kubernetes
     options:
@@ -124,7 +124,7 @@
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-1"
+    charm: "cs:~charmed-osm/pol-3"
     scale: 1
     series: kubernetes
     options:
@@ -133,7 +133,7 @@
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-7"
+    charm: "cs:~charmed-osm/pla-8"
     scale: 1
     series: kubernetes
     options:
@@ -142,7 +142,7 @@
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-1"
+    charm: "cs:~charmed-osm/prometheus-2"
     scale: 1
     series: kubernetes
     storage:
@@ -153,14 +153,14 @@
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-1"
+    charm: "cs:~charmed-osm/grafana-2"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-5"
+    charm: "cs:~charmed-osm/keystone-7"
     scale: 1
     series: kubernetes
     annotations: