diff --git a/cmd/gbrgames/build.go b/cmd/gbrgames/build.go
index 1d4a96b..fd81ae8 100644
--- a/cmd/gbrgames/build.go
+++ b/cmd/gbrgames/build.go
@@ -236,6 +236,10 @@ func bootCheck(gamesDir, id, agentImage string, wantOutside bool) (problems, ver
 	if err != nil {
 		return nil, nil, err
 	}
+	// A boot test that was killed (worker restarted mid-build) leaves its container and volume behind,
+	// and the next deploy under the same name would trip over them
+	runCmd("docker", "rm", "-f", "boottest-"+id)
+	runCmd("docker", "volume", "rm", "-f", "boottest-"+id+"-data")
 	payloadCmd := exec.Command(self, "boottest-payload", "-games", gamesDir, id)
 	var stderr bytes.Buffer
 	payloadCmd.Stderr = &stderr