diff --git a/block_federation.sh b/block_federation.sh
index 70b7ec1..2613899 100755
--- a/block_federation.sh
+++ b/block_federation.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CONTAINER_TO_REMOVE=openfire-docker-compose-xmpp2-1
+CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp2.1)
 CONTAINER_NAME=pumba_node2
 
 echo "About to be blocked from communication: $CONTAINER_TO_REMOVE"
diff --git a/block_node_from_cluster.sh b/block_node_from_cluster.sh
index 60da2cb..10c4124 100755
--- a/block_node_from_cluster.sh
+++ b/block_node_from_cluster.sh
@@ -4,7 +4,7 @@
 #Example usage: `./remove_node_from_cluster.sh 1` to remove node xmpp1
 
 NODE=$1
-CONTAINER_TO_REMOVE=openfire-docker-compose-xmpp"$NODE"-1
+CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp"$NODE".1)
 CONTAINER_NAME=pumba_node"$NODE"
 
 echo "About to be removed from cluster: $CONTAINER_TO_REMOVE"