diff --git a/cyphernodeconf_docker/templates/installer/start.sh b/cyphernodeconf_docker/templates/installer/start.sh
index 647cab4..40c92e1 100644
--- a/cyphernodeconf_docker/templates/installer/start.sh
+++ b/cyphernodeconf_docker/templates/installer/start.sh
@@ -59,9 +59,10 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+dist_dir=${current_path##/*/}
 
 # Let's make sure the container readyness files are deleted before starting the stack
-docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
+docker run --rm -v ${dist_dir}_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
 
 <% if (docker_mode == 'swarm') { %>
 docker stack deploy -c $current_path/docker-compose.yaml cyphernode
diff --git a/cyphernodeconf_docker/templates/installer/testdeployment.sh b/cyphernodeconf_docker/templates/installer/testdeployment.sh
index 2cfa327..d46dbd0 100644
--- a/cyphernodeconf_docker/templates/installer/testdeployment.sh
+++ b/cyphernodeconf_docker/templates/installer/testdeployment.sh
@@ -52,12 +52,13 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
 <% } %>
 
 current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+dist_dir=${current_path##/*/}
 
 # Will test if Cyphernode is fully up and running...
 docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
 -v <%= gatekeeper_datapath %>:/gatekeeper \
 -v $current_path:/dist \
--v cyphernode_container_monitor:/container_monitor:ro \
+-v ${dist_dir}_container_monitor:/container_monitor:ro \
 --network cyphernodenet eclipse-mosquitto:<%= mosquitto_version %> /testfeatures.sh
 
 if [ -f $current_path/exitStatus.sh ]; then