diff --git a/Makefile b/Makefile
index f4b65de2..d5d9684a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,12 +50,12 @@ logs: deps
 
 # This will shell you into the running web container
 shell: deps
-	docker exec -ti web-frontend-web-frontend-1 /bin/sh
+	docker exec -ti web-frontend_web-frontend_1 /bin/sh
 
 # This will run formatting and fix linting on the repo
 format: deps
-	docker exec -ti web-frontend-web-frontend-1 /bin/sh -c "yarn format && yarn lint --fix"
+	docker exec -ti web-frontend_web-frontend_1 /bin/sh -c "yarn format && yarn lint --fix"
 
 # This will show any linting warnings
 lint: deps
-	docker exec -ti web-frontend-web-frontend-1 /bin/sh -c "yarn lint" 
+	docker exec -ti web-frontend_web-frontend_1 /bin/sh -c "yarn lint" 
diff --git a/package.json b/package.json
index d27939ee..88a00caa 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "serve": "next start",
     "storybook": "start-storybook -p 6006 -s public",
     "test-ci": "tsc && cross-env CI=true TZ=UTC jest --runInBand --coverageReporters=\"cobertura\" --coverageReporters=\"lcov\" --reporters=\"default\" --reporters=\"jest-junit\" --coverage",
-    "test": "cross-env TZ=UTC jest --watch",
+    "test": "cross-env TZ=UTC jest --watchAll",
     "typecheck": "tsc"
   },
   "dependencies": {