diff --git a/apps/demo/project.json b/apps/demo/project.json
index 9a3556c3..5f441a02 100644
--- a/apps/demo/project.json
+++ b/apps/demo/project.json
@@ -31,6 +31,7 @@
             },
             "configurations": {
                 "production": {
+                    "baseHref": "./",
                     "fileReplacements": [
                         {
                             "replace": "apps/demo/src/environments/environment.ts",
@@ -38,7 +39,7 @@
                         }
                     ],
                     "optimization": true,
-                    "outputHashing": "all",
+                    "outputHashing": "media",
                     "sourceMap": false,
                     "namedChunks": false,
                     "extractLicenses": true,
@@ -70,16 +71,17 @@
             "options": {
                 "parallel": false,
                 "commands": [
-                    "nx run demo:prerender:github",
+                    "rm -rf dist/demo",
+                    "npx nx prerender demo",
                     "cp dist/demo/index.html dist/demo/404.html",
-                    "rm dist/demo/index.original.html"
+                    "rm -rf dist/demo/server dist/demo/index.original.html"
                 ]
             }
         },
         "prerender": {
             "executor": "@nguniversal/builders:prerender",
             "options": {
-                "browserTarget": "demo:build:github",
+                "browserTarget": "demo:build:production",
                 "serverTarget": "demo:server:production",
                 "guessRoutes": false,
                 "routes": ["/"]
@@ -94,7 +96,10 @@
             },
             "configurations": {
                 "production": {
-                    "outputHashing": "media"
+                    "outputHashing": "media",
+                    "sourceMap": false,
+                    "buildOptimizer": true,
+                    "vendorChunk": false
                 }
             },
             "defaultConfiguration": "production"
diff --git a/apps/demo/src/app/home/home.component.less b/apps/demo/src/app/home/home.component.less
index 110bb973..a1dec9c8 100644
--- a/apps/demo/src/app/home/home.component.less
+++ b/apps/demo/src/app/home/home.component.less
@@ -35,8 +35,8 @@
     justify-content: space-between;
 }
 
-.button,
-.error {
+.button[data-size][data-shape],
+.error[data-size][data-shape] {
     .transition(~'color, background');
     background: var(--tui-base-02);
     color: var(--tui-primary);
@@ -48,7 +48,7 @@
     }
 }
 
-.error {
+.error[data-size][data-shape] {
     color: var(--tui-negative);
 
     &:hover,
diff --git a/apps/demo/tsconfig.app.json b/apps/demo/tsconfig.app.json
index fbc1c35c..97c3e0a1 100644
--- a/apps/demo/tsconfig.app.json
+++ b/apps/demo/tsconfig.app.json
@@ -1,13 +1,9 @@
 {
     "extends": "../../tsconfig.json",
-    "angularCompilerOptions": {
-        "strictMetadataEmit": false,
-        "compilationMode": "full"
-    },
     "compilerOptions": {
+        "removeComments": true,
         "baseUrl": ".",
         "outDir": "../../dist/out-tsc",
-        "useDefineForClassFields": false,
         "types": []
     },
     "files": ["src/main.ts", "src/polyfills.ts"]
diff --git a/apps/demo/tsconfig.server.json b/apps/demo/tsconfig.server.json
index b477b97d..98c7d412 100644
--- a/apps/demo/tsconfig.server.json
+++ b/apps/demo/tsconfig.server.json
@@ -1,6 +1,7 @@
 {
     "extends": "./tsconfig.app.json",
     "compilerOptions": {
+        "removeComments": true,
         "outDir": "./out-tsc/server",
         "types": ["node"]
     },
diff --git a/tsconfig.json b/tsconfig.json
index 01a64cbc..d8e6c74a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,13 @@
 {
     "extends": "@taiga-ui/tsconfig",
+    "angularCompilerOptions": {
+        "compilationMode": "full"
+    },
     "compilerOptions": {
         "rootDir": ".",
         "baseUrl": ".",
         "module": "esnext",
+        "removeComments": true,
         "useDefineForClassFields": false,
         "typeRoots": ["node_modules/@types"]
     }