diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 237a2f9ad5..d6ce4a2e1f 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -28,7 +28,7 @@ else
         neutron_{server,dhcp_agent,l3_agent,linuxbridge_agent,metadata_agent,openvswitch_agent} \
         nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \
         openvswitch_{vswitchd,db} \
-        rabbitmq{,_data} \
+        rabbitmq \
         rsyslog \
         swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd}
     )