diff --git a/integration-test/src/test/java/org/apache/geronimo/arthur/integrationtests/container/MavenContainer.java b/integration-test/src/test/java/org/apache/geronimo/arthur/integrationtests/container/MavenContainer.java
index 635bbb5..1c29e2b 100644
--- a/integration-test/src/test/java/org/apache/geronimo/arthur/integrationtests/container/MavenContainer.java
+++ b/integration-test/src/test/java/org/apache/geronimo/arthur/integrationtests/container/MavenContainer.java
@@ -56,7 +56,10 @@
         final DockerClient client = DockerClientFactory.instance().client();
         try {
             // note that docker daemon can ignore filter parameter so let's check it exactly
-            final List<Image> images = client.listImagesCmd().withImageNameFilter(targetImage).exec();
+            final List<Image> images = client.listImagesCmd()
+                    .withLabelFilter("org.apache.geronimo.arthur.tag=" + tag)
+                    .withDanglingFilter(false)
+                    .exec();
             if (images.size() == 1) {
                 log.info("Found '{}' image, reusing it", targetImage);
                 return targetImage;