diff --git a/items/frontend/package.json b/items/frontend/package.json
index e834248..1cc5a97 100644
--- a/items/frontend/package.json
+++ b/items/frontend/package.json
@@ -15,7 +15,8 @@
         "cross-env": "^7.0.3",
         "cypress": "9.0.0",
         "start-server-and-test": "^1.14.0",
-        "typescript": "^4.1.2"
+        "typescript": "^4.1.2",
+        "wait-on": "^6.0.0"
     },
     "dependencies": {
         "@emotion/react": "^11.4.1",
@@ -38,9 +39,8 @@
         "test:jest": "react-scripts test",
         "cy:start:app": "cross-env BROWSER=none react-scripts -r @cypress/instrument-cra start",
         "cy:start:wait": "start-server-and-test cy:start:app http://localhost:3000",
-        "cy:start:wait:ci": "start-server-and-test cy:start:app http://frontend:3000",
         "cy:open": "yarn run cy:start:wait -- \"cypress open\"",
-        "cy:run": "yarn run cy:start:wait:ci -- \"cypress run\"",
+        "cy:run": "yarn run wait-on http-get://frontend:3000 && \"cypress run\"",
         "eject": "react-scripts eject"
     },
     "eslintConfig": {
diff --git a/items/frontend/yarn.lock b/items/frontend/yarn.lock
index 8ae89ba..6d86166 100644
--- a/items/frontend/yarn.lock
+++ b/items/frontend/yarn.lock
@@ -13195,7 +13195,7 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-wait-on@6.0.0:
+wait-on@6.0.0, wait-on@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"
   integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==