diff --git a/ponyracer/e2e/tsconfig.json b/ponyracer/e2e/tsconfig.json
index 1807fd68a..426058ef0 100644
--- a/ponyracer/e2e/tsconfig.json
+++ b/ponyracer/e2e/tsconfig.json
@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
diff --git a/ponyracer/package.json b/ponyracer/package.json
index 2f2283dd3..43b8bca36 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -11,22 +11,22 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.1.0-next.4",
-    "@angular/common": "~10.1.0-next.4",
-    "@angular/compiler": "~10.1.0-next.4",
-    "@angular/core": "~10.1.0-next.4",
-    "@angular/forms": "~10.1.0-next.4",
-    "@angular/platform-browser": "~10.1.0-next.4",
-    "@angular/platform-browser-dynamic": "~10.1.0-next.4",
-    "@angular/router": "~10.1.0-next.4",
+    "@angular/animations": "~10.1.0-next.5",
+    "@angular/common": "~10.1.0-next.5",
+    "@angular/compiler": "~10.1.0-next.5",
+    "@angular/core": "~10.1.0-next.5",
+    "@angular/forms": "~10.1.0-next.5",
+    "@angular/platform-browser": "~10.1.0-next.5",
+    "@angular/platform-browser-dynamic": "~10.1.0-next.5",
+    "@angular/router": "~10.1.0-next.5",
     "rxjs": "~6.6.0",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1001.0-next.4",
-    "@angular/cli": "~10.1.0-next.4",
-    "@angular/compiler-cli": "~10.1.0-next.4",
+    "@angular-devkit/build-angular": "~0.1001.0-next.5",
+    "@angular/cli": "~10.1.0-next.5",
+    "@angular/compiler-cli": "~10.1.0-next.5",
     "@types/node": "^12.11.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
@@ -36,7 +36,7 @@
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~3.3.0",
+    "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
diff --git a/ponyracer/tsconfig.app.json b/ponyracer/tsconfig.app.json
index 232c3a5ce..82d91dc4a 100644
--- a/ponyracer/tsconfig.app.json
+++ b/ponyracer/tsconfig.app.json
@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []
diff --git a/ponyracer/tsconfig.base.json b/ponyracer/tsconfig.base.json
deleted file mode 100644
index 751f3f80d..000000000
--- a/ponyracer/tsconfig.base.json
+++ /dev/null
@@ -1,28 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "module": "es2020",
-    "lib": [
-      "es2018",
-      "dom"
-    ]
-  },
-  "angularCompilerOptions": {
-    "strictInjectionParameters": true,
-    "strictTemplates": true
-  }
-}
diff --git a/ponyracer/tsconfig.json b/ponyracer/tsconfig.json
index 2338536ef..751f3f80d 100644
--- a/ponyracer/tsconfig.json
+++ b/ponyracer/tsconfig.json
@@ -1,17 +1,28 @@
-/*
-  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
-  It is not intended to be used to perform a compilation.
-
-  To learn more about this file see: https://angular.io/config/solution-tsconfig.
-*/
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-]
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "es2020",
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  },
+  "angularCompilerOptions": {
+    "strictInjectionParameters": true,
+    "strictTemplates": true
+  }
 }
diff --git a/ponyracer/tsconfig.spec.json b/ponyracer/tsconfig.spec.json
index 729a6d636..092345b02 100644
--- a/ponyracer/tsconfig.spec.json
+++ b/ponyracer/tsconfig.spec.json
@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [