diff --git a/mage_helpers/debug.go b/mage_helpers/debug.go
index 3d07d6c42d948a60aaeff8c707e5839177759822..58ac652b6c15778f4250f47d8832158fde350c28 100644
--- a/mage_helpers/debug.go
+++ b/mage_helpers/debug.go
@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"os/user"
+	"strings"
 	"syscall"
 
 	"github.com/docker/docker/api/types"
@@ -123,7 +124,7 @@ func stopRunningSamDocker() {
 
 	for _, container := range containers {
 		mustStop := false
-		if container.Command == "/var/rapid/aws-lambda-rie" {
+		if strings.Contains(container.Command, "/var/rapid/aws-lambda-rie") {
 			mustStop = true
 		} else {
 			for _, port := range container.Ports {