diff --git a/.circleci/config.yml b/.circleci/config.yml
index bee7003be4b..1ffbe71da79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,14 +39,9 @@ jobs:
           name: 'Run Unit tests'
           command: yarn test:ci
 
-      - run:
-          name: 'Start Server'
-          command: yarn run start
-          background: true
-
       - run:
           name: 'Run Cypress tests'
-          command: yarn run cy:run:ci
+          command: yarn start:e2e:ci
           no_output_timeout: '1m'
 
     artifacts:
diff --git a/package.json b/package.json
index d669f662232..d0d3f82dc46 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "cy:verify": "$(npm bin)/cypress verify",
     "cy:version": "$(npm bin)/cypress version",
     "cy:run:ci": "$(npm bin)/cypress run",
+    "start:e2e:ci": "ng serve & wait-on http://localhost:4200 && npm run cy:run:ci",
     "cy:run": "ng serve & wait-on http://localhost:4200 && $(npm bin)/cypress run",
     "cy:run:watch": "ng serve & wait-on http://localhost:4200 && $(npm bin)/cypress open",
     "test:backend": "ng test ng-devtools-backend --watch=false",
@@ -87,6 +88,6 @@
     "tsickle": "^0.35.0",
     "tslint": "~5.18.0",
     "typescript": "~3.7.0",
-    "wait-on": "^4.0.0"
+    "wait-on": "^4.0.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 7084f2d3a86..fd784c32973 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -157,8 +157,7 @@
     rxjs "6.5.4"
 
 "@angular/animations@github:angular/animations-builds#3b2806a6af51a2397a2dd5bec7d28e2d52f6b468":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "3b2806a6af51a2397a2dd5bec7d28e2d52f6b468"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/animations-builds/tar.gz/3b2806a6af51a2397a2dd5bec7d28e2d52f6b468"
 
 "@angular/cdk@~9.1.0":
@@ -194,13 +193,11 @@
     uuid "7.0.1"
 
 "@angular/common@github:angular/common-builds#4919989ce94be9477e479db68e2fa81bf9697a95":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "4919989ce94be9477e479db68e2fa81bf9697a95"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/common-builds/tar.gz/4919989ce94be9477e479db68e2fa81bf9697a95"
 
 "@angular/compiler-cli@github:angular/compiler-cli-builds#551ac2ae8dba35484ef3f44835a932a784691f39":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "551ac2ae8dba35484ef3f44835a932a784691f39"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/compiler-cli-builds/tar.gz/551ac2ae8dba35484ef3f44835a932a784691f39"
   dependencies:
     canonical-path "1.0.0"
@@ -217,28 +214,23 @@
     yargs "15.3.0"
 
 "@angular/compiler@github:angular/compiler-builds#45593e00a5d0a0123a445a7060b6f36bccdfe584":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "45593e00a5d0a0123a445a7060b6f36bccdfe584"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/compiler-builds/tar.gz/45593e00a5d0a0123a445a7060b6f36bccdfe584"
 
 "@angular/core@github:angular/core-builds#ffe81df6a8cd384b1460a745de2093ee848ded60":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid ffe81df6a8cd384b1460a745de2093ee848ded60
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/core-builds/tar.gz/ffe81df6a8cd384b1460a745de2093ee848ded60"
 
 "@angular/elements@github:angular/elements-builds#b01eb01644beea2d097043acff74a463679bec71":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid b01eb01644beea2d097043acff74a463679bec71
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/elements-builds/tar.gz/b01eb01644beea2d097043acff74a463679bec71"
 
 "@angular/forms@github:angular/forms-builds#573d3ce5855321e75b2ff769f8a73478ef9843e4":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "573d3ce5855321e75b2ff769f8a73478ef9843e4"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/forms-builds/tar.gz/573d3ce5855321e75b2ff769f8a73478ef9843e4"
 
 "@angular/language-service@github:angular/language-service-builds#a3f4e4c78fcaaa90a2b065a6effc94e202435f93":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid a3f4e4c78fcaaa90a2b065a6effc94e202435f93
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/language-service-builds/tar.gz/a3f4e4c78fcaaa90a2b065a6effc94e202435f93"
 
 "@angular/material@~9.1.0":
@@ -247,18 +239,15 @@
   integrity sha512-8uwwkSnsg/YlhqxD/+0Cj+1S97Xf5WUcgxSEXmC1r0/AD+o6PGL5ImIk4n+3tdgYqm7MoJZQthlIB2J0EVLjVw==
 
 "@angular/platform-browser-dynamic@github:angular/platform-browser-dynamic-builds#f771124529e08e62b683885413dfac28ed692d30":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid f771124529e08e62b683885413dfac28ed692d30
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/platform-browser-dynamic-builds/tar.gz/f771124529e08e62b683885413dfac28ed692d30"
 
 "@angular/platform-browser@github:angular/platform-browser-builds#b80db93cdaa6352f725fac1f63954487a80c0283":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid b80db93cdaa6352f725fac1f63954487a80c0283
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/platform-browser-builds/tar.gz/b80db93cdaa6352f725fac1f63954487a80c0283"
 
 "@angular/router@github:angular/router-builds#2cd4274ca4f119536045b22fb71d51b6906d632e":
-  version "9.1.0-next.4+36.sha-0d806c8"
-  uid "2cd4274ca4f119536045b22fb71d51b6906d632e"
+  version "9.1.0-next.4"
   resolved "https://codeload.github.com/angular/router-builds/tar.gz/2cd4274ca4f119536045b22fb71d51b6906d632e"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
@@ -10422,7 +10411,7 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-wait-on@^4.0.0:
+wait-on@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-4.0.1.tgz#c49ca18b1ea60580404feed9df76ab3af2425a56"
   integrity sha512-x83fmTH2X0KL7vXoGt9aV5x4SMCvO8A/NbwWpaYYh4NJ16d3KSgbHwBy9dVdHj0B30cEhOFRvDob4fnpUmZxvA==