diff --git a/apache/lib/common b/apache/lib/common
index 78a775a..4fa9874 100644
--- a/apache/lib/common
+++ b/apache/lib/common
@@ -798,7 +798,7 @@ target-get() {
     target=$(e "$cfg" | cfg-get-value target 2>/dev/null) || true
     if [ -z "$target" ]; then
         ## First exposed port:
-        base_image=$(service_base_docker_image "$BASE_SERVICE_NAME") || return 1
+        base_image=$(service_ensure_image_ready "$BASE_SERVICE_NAME") || return 1
         if ! docker_has_image "$base_image"; then
             docker pull "$base_image" >&2
         fi
diff --git a/cyclos/lib/common b/cyclos/lib/common
index 7ba451a..7b146b3 100644
--- a/cyclos/lib/common
+++ b/cyclos/lib/common
@@ -54,7 +54,7 @@ sql() {
 
         export SERVICE_NAME="$ts"
         export SERVICE_DATASTORE="$DATASTORE/$SERVICE_NAME"
-        DOCKER_BASE_IMAGE=$(service_base_docker_image "$SERVICE_NAME")
+        DOCKER_BASE_IMAGE=$(service_ensure_image_ready "$SERVICE_NAME") || exit 1
         export DOCKER_BASE_IMAGE
 
         target_charm=$(get_service_charm "$ts") || exit 1
diff --git a/mongo/actions/relations/mongo-database/mongosh b/mongo/actions/relations/mongo-database/mongosh
index d04d682..edad655 100755
--- a/mongo/actions/relations/mongo-database/mongosh
+++ b/mongo/actions/relations/mongo-database/mongosh
@@ -69,7 +69,7 @@ mongosh() {
 
         export SERVICE_NAME="$RELATION_TARGET_SERVICE"
         export SERVICE_DATASTORE="$DATASTORE/$SERVICE_NAME"
-        DOCKER_BASE_IMAGE=$(service_base_docker_image "$SERVICE_NAME")
+        DOCKER_BASE_IMAGE=$(service_ensure_image_ready "$SERVICE_NAME")
         export DOCKER_BASE_IMAGE
 
         target_charm_path=$(charm.get_dir $RELATION_TARGET_CHARM) || exit 1
diff --git a/piwigo/hooks/post_deploy b/piwigo/hooks/post_deploy
index 6611a80..80ea632 100755
--- a/piwigo/hooks/post_deploy
+++ b/piwigo/hooks/post_deploy
@@ -77,7 +77,7 @@ if [ -f "$CONFIG" ]; then
 
     export SERVICE_NAME="$ts"
     export SERVICE_DATASTORE="$DATASTORE/$SERVICE_NAME"
-    DOCKER_BASE_IMAGE=$(service_base_docker_image "$SERVICE_NAME")
+    DOCKER_BASE_IMAGE=$(service_ensure_image_ready "$SERVICE_NAME")
     export DOCKER_BASE_IMAGE
 
     target_charm=$(get_service_charm "$ts") || exit 1