diff --git a/bin/compose b/bin/compose
index 783cdbf..de62d08 100755
--- a/bin/compose
+++ b/bin/compose
@@ -1091,7 +1091,8 @@ run_service_hook () {
             Wrap -d "$YELLOW$action$NORMAL hook of charm $DARKYELLOW$charm$NORMAL" <<EOF || return 1
 
             export SERVICE_NAME=$subservice
-            export IMAGE_NAME=$(echo "${PROJECT_NAME}" | tr -d "_-")_\${SERVICE_NAME}
+            export MASTER_BASE_CHARM_NAME=$(get_top_master_charm_for_service "$subservice") || return 1
+            export IMAGE_NAME=$(echo "${PROJECT_NAME}" | tr -d "_-")_\${MASTER_BASE_CHARM_NAME}
             export CONTAINER_NAME=\${IMAGE_NAME}_1
             export CHARM_NAME="$charm"
             export PROJECT_NAME=$PROJECT_NAME
@@ -2449,6 +2450,7 @@ full_init=
 case "$action" in
     up|run)
         full_init=true
+        post_hook=true
         ;;
     "")
         full_init=
@@ -2516,3 +2518,8 @@ case "$action" in
         fi
         ;;
 esac
+
+
+if [ "$post_hook" ]; then
+    run_service_hook "$services" post_deploy || exit 1
+fi