diff --git a/mage_helpers/debug.go b/mage_helpers/debug.go
index d7eac4d38bde5cd790895597bbcdb34dd1420026..e8a40e8ded0a3cc172bf94955357937bf697dfe2 100644
--- a/mage_helpers/debug.go
+++ b/mage_helpers/debug.go
@@ -118,7 +118,7 @@ func stopRunningSamDocker() {
 		panic(err)
 	}
 
-	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
+	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true})
 	if err != nil {
 		panic(err)
 	}
@@ -140,7 +140,11 @@ func stopRunningSamDocker() {
 			if err != nil {
 				panic(err)
 			}
-			log.Printf("Stopped container %s\n", container.ID)
+			err = cli.ContainerRemove(context.Background(), container.ID, types.ContainerRemoveOptions{})
+			if err != nil {
+				panic(err)
+			}
+			log.Printf("Stopped and removed container %s\n", container.ID)
 		}
 	}