diff --git a/installers/charm/lcm-k8s/config.yaml b/installers/charm/lcm-k8s/config.yaml
index 1f1c62bb014a86cda6ce11283cbe9e889ba52137..e5ed6e16e01836b54358e6ee92f1e5635294fb44 100644
--- a/installers/charm/lcm-k8s/config.yaml
+++ b/installers/charm/lcm-k8s/config.yaml
@@ -65,7 +65,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/lcm:8
+    default: opensourcemano/lcm:9
   image_username:
     description: Docker repository username
     type: string
diff --git a/installers/charm/lcm/metadata.yaml b/installers/charm/lcm/metadata.yaml
index 155e4c3e34cd77508d5d273b9079d65e5c8d33bd..1507b9f5f2b8b59cec024f516da8363b7e6dddb4 100644
--- a/installers/charm/lcm/metadata.yaml
+++ b/installers/charm/lcm/metadata.yaml
@@ -37,7 +37,7 @@ resources:
   image:
     type: oci-image
     description: OSM docker image for LCM
-    upstream-source: "opensourcemano/lcm:8"
+    upstream-source: "opensourcemano/lcm:9"
 requires:
   kafka:
     interface: kafka
diff --git a/installers/charm/mon-k8s/config.yaml b/installers/charm/mon-k8s/config.yaml
index 6f44b2e193936991f51b23c2e1a61751cb1503b0..0d43520bed7c148ec535962e5cae99c080b46e81 100644
--- a/installers/charm/mon-k8s/config.yaml
+++ b/installers/charm/mon-k8s/config.yaml
@@ -67,7 +67,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/mon:8
+    default: opensourcemano/mon:9
   image_username:
     description: Docker repository username
     type: string
diff --git a/installers/charm/mon/metadata.yaml b/installers/charm/mon/metadata.yaml
index 2578b1ebbd83bd6bf78542fe1e9399066318f5c1..954fe375b7ece6c932effff404f0d1195a8f2e99 100644
--- a/installers/charm/mon/metadata.yaml
+++ b/installers/charm/mon/metadata.yaml
@@ -37,7 +37,7 @@ resources:
   image:
     type: oci-image
     description: OSM docker image for MON
-    upstream-source: "opensourcemano/mon:8"
+    upstream-source: "opensourcemano/mon:9"
 requires:
   kafka:
     interface: kafka
diff --git a/installers/charm/nbi-k8s/config.yaml b/installers/charm/nbi-k8s/config.yaml
index a594f6e5cf5f67a2db1689a2e194db67a2931db3..4ca2ad869cf46a65c364ac6228cbc241ea6bbcf8 100755
--- a/installers/charm/nbi-k8s/config.yaml
+++ b/installers/charm/nbi-k8s/config.yaml
@@ -31,7 +31,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/nbi:8
+    default: opensourcemano/nbi:9
   image_username:
     description: Docker repository username
     type: string
diff --git a/installers/charm/nbi/metadata.yaml b/installers/charm/nbi/metadata.yaml
index e4b55ab30529ef4247c87a1777a2e155e84bde7b..61d6b4be9b85d655e81fdc902d914a3c31fbf89e 100644
--- a/installers/charm/nbi/metadata.yaml
+++ b/installers/charm/nbi/metadata.yaml
@@ -37,7 +37,7 @@ resources:
   image:
     type: oci-image
     description: OSM docker image for NBI
-    upstream-source: "opensourcemano/nbi:8"
+    upstream-source: "opensourcemano/nbi:9"
 requires:
   kafka:
     interface: kafka
diff --git a/installers/charm/ng-ui/metadata.yaml b/installers/charm/ng-ui/metadata.yaml
index 316047ff30b0ff1708bce046e39f597f20b6cfce..e00266a252cedd9e5a944e9f0868f011da78b4a3 100644
--- a/installers/charm/ng-ui/metadata.yaml
+++ b/installers/charm/ng-ui/metadata.yaml
@@ -29,4 +29,4 @@ resources:
   image:
     type: oci-image
     description: OSM docker image for NBI
-    upstream-source: "opensourcemano/ng-ui:8"
+    upstream-source: "opensourcemano/ng-ui:9"
diff --git a/installers/charm/pol-k8s/config.yaml b/installers/charm/pol-k8s/config.yaml
index d33a715f1883286f515b8765f900399be649afcf..95bca15c80d6c1b793e019ee751b45b8714e6a4b 100644
--- a/installers/charm/pol-k8s/config.yaml
+++ b/installers/charm/pol-k8s/config.yaml
@@ -23,7 +23,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/pol:8
+    default: opensourcemano/pol:9
   image_username:
     description: Docker repository username
     type: string
diff --git a/installers/charm/pol/metadata.yaml b/installers/charm/pol/metadata.yaml
index a0fa3fe6c651df37248d0da0d4c3bfc02f8a4aa8..78c4830ab522ba991b93cbe31625e62882161e4d 100644
--- a/installers/charm/pol/metadata.yaml
+++ b/installers/charm/pol/metadata.yaml
@@ -37,7 +37,7 @@ resources:
   image:
     type: oci-image
     description: OSM docker image for POL
-    upstream-source: "opensourcemano/pol:8"
+    upstream-source: "opensourcemano/pol:9"
 requires:
   kafka:
     interface: kafka
diff --git a/installers/charm/ro-k8s/config.yaml b/installers/charm/ro-k8s/config.yaml
index e93cc495ffb91f1929d011598c205a7374da4588..42b281d3e4b31f4c821a6df1f282b7120dd49847 100755
--- a/installers/charm/ro-k8s/config.yaml
+++ b/installers/charm/ro-k8s/config.yaml
@@ -31,7 +31,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/ro:8
+    default: opensourcemano/ro:9
   image_username:
     description: Docker repository username
     type: string
@@ -43,4 +43,4 @@ options:
   database_commonkey:
     description: Database common key
     type: string
-    default: osm
\ No newline at end of file
+    default: osm
diff --git a/installers/charm/ui-k8s/config.yaml b/installers/charm/ui-k8s/config.yaml
index d4321ae9465f1576700d2411b51f64d05976f8ac..5a156b16bd47fe9ee42297b31c51f61a248db94e 100755
--- a/installers/charm/ui-k8s/config.yaml
+++ b/installers/charm/ui-k8s/config.yaml
@@ -27,7 +27,7 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/light-ui:8
+    default: opensourcemano/light-ui:9
   image_username:
     description: Docker repository username
     type: string
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 4d04a913ceb3710ba9c1162deb14f2dd9ef13482..7f05e04460edf1ac670587602758c72eadae3ab6 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -310,14 +310,14 @@ function create_overlay() {
     sudo snap install jq
     sudo snap install yq
     local HOME=/home/$USER
-    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.user)
-    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.password)
-    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 1)
-    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 2)
+    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.user - )
+    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.password - )
+    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 1)
+    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 2)
     local vca_pubkey=\"$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)\"
     local vca_cloud="lxd-cloud"
     # Get the VCA Certificate
-    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.ca-cert | base64 | tr -d \\n)
+    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.ca-cert - | base64 | tr -d \\n)
 
     # Calculate the default route of this machine
     local DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5}'`