diff --git a/files/certmonger-haproxy-refresh.sh b/files/certmonger-haproxy-refresh.sh
index 4a8c82d18..8e83355a3 100644
--- a/files/certmonger-haproxy-refresh.sh
+++ b/files/certmonger-haproxy-refresh.sh
@@ -33,7 +33,7 @@ fi
 
 cat "$service_certificate" "$ca_path" "$service_key" > "$service_pem"
 
-haproxy_container_name=$($container_cli ps --format="{{.Names}}" | grep haproxy)
+haproxy_container_name=$($container_cli ps --format="{{.Names}}" | grep -w -E 'haproxy(-bundle-.*-[0-9]+)?')
 
 if [ "$ACTION" == "reload" ]; then
     # Copy the new cert from the mount-point to the real path
diff --git a/files/certmonger-rabbitmq-refresh.sh b/files/certmonger-rabbitmq-refresh.sh
index 6658b5e64..9175727ab 100644
--- a/files/certmonger-rabbitmq-refresh.sh
+++ b/files/certmonger-rabbitmq-refresh.sh
@@ -3,7 +3,7 @@
 
 container_cli=$(hiera -c /etc/puppet/hiera.yaml container_cli podman)
 
-container_name=$($container_cli ps --format="{{.Names}}" | grep rabbitmq)
+container_name=$($container_cli ps --format="{{.Names}}" | grep -w -E 'rabbitmq(-bundle-.*-[0-9]+)?')
 
 service_pem="$(hiera -c /etc/puppet/hiera.yaml tripleo::rabbitmq::service_certificate)"