diff --git a/ponyracer/e2e/tsconfig.json b/ponyracer/e2e/tsconfig.json
index c92199cfd..6b87cc425 100644
--- a/ponyracer/e2e/tsconfig.json
+++ b/ponyracer/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
diff --git a/ponyracer/package.json b/ponyracer/package.json
index 2c4b46273..240187972 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -11,22 +11,22 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.0.0-next.8",
-    "@angular/common": "~10.0.0-next.8",
-    "@angular/compiler": "~10.0.0-next.8",
-    "@angular/core": "~10.0.0-next.8",
-    "@angular/forms": "~10.0.0-next.8",
-    "@angular/platform-browser": "~10.0.0-next.8",
-    "@angular/platform-browser-dynamic": "~10.0.0-next.8",
-    "@angular/router": "~10.0.0-next.8",
+    "@angular/animations": "~10.0.0-rc.0",
+    "@angular/common": "~10.0.0-rc.0",
+    "@angular/compiler": "~10.0.0-rc.0",
+    "@angular/core": "~10.0.0-rc.0",
+    "@angular/forms": "~10.0.0-rc.0",
+    "@angular/platform-browser": "~10.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "~10.0.0-rc.0",
+    "@angular/router": "~10.0.0-rc.0",
     "rxjs": "~6.5.4",
-    "tslib": "^1.12.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.0-next.6",
-    "@angular/cli": "~10.0.0-next.6",
-    "@angular/compiler-cli": "~10.0.0-next.8",
+    "@angular-devkit/build-angular": "~0.1000.0-rc.0",
+    "@angular/cli": "~10.0.0-rc.0",
+    "@angular/compiler-cli": "~10.0.0-rc.0",
     "@types/node": "^12.11.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
diff --git a/ponyracer/tsconfig.app.json b/ponyracer/tsconfig.app.json
index f758d9820..44795bd55 100644
--- a/ponyracer/tsconfig.app.json
+++ b/ponyracer/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []
diff --git a/ponyracer/tsconfig.base.json b/ponyracer/tsconfig.base.json
new file mode 100644
index 000000000..430c1c5d6
--- /dev/null
+++ b/ponyracer/tsconfig.base.json
@@ -0,0 +1,27 @@
+{
+  "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 eeee15999..db86a4c46 100644
--- a/ponyracer/tsconfig.json
+++ b/ponyracer/tsconfig.json
@@ -1,27 +1,16 @@
+// 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.
 {
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "es2020",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "lib": [
-      "es2018",
-      "dom"
-    ]
-  },
-  "angularCompilerOptions": {
-    "strictInjectionParameters": true,
-    "strictTemplates": true
-  }
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./e2e/tsconfig.json"
+    }
+]
 }
diff --git a/ponyracer/tsconfig.spec.json b/ponyracer/tsconfig.spec.json
index 6400fde7d..1db2e6ee9 100644
--- a/ponyracer/tsconfig.spec.json
+++ b/ponyracer/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [