diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0f320c0ec..bc48118e94 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,12 @@ jobs:
 
       - name: Install Netlify CLI
         run: npm install netlify-cli -g
+
+      - name: Delete netlify.toml
+        run: rm -f netlify.toml
+  
+      - name: Rename github-netlify.toml to netlify.toml
+        run: mv github-netlify.toml netlify.toml
         
       - name: Build using Netlify
         run: netlify build --context deploy-preview
diff --git a/site/gatsby-site/github-netlify.toml b/site/gatsby-site/github-netlify.toml
new file mode 100644
index 0000000000..5f0e4f353c
--- /dev/null
+++ b/site/gatsby-site/github-netlify.toml
@@ -0,0 +1,11 @@
+[[plugins]]
+  package = "@netlify/plugin-gatsby"
+
+[[plugins]]
+  package = "/plugins/netlify-plugin-create-admin-user"
+
+[[plugins]]
+  package = "/plugins/netlify-plugin-process-notifications"
+
+[build.processing.html]
+  pretty_urls = false
\ No newline at end of file
diff --git a/site/gatsby-site/netlify.toml b/site/gatsby-site/netlify.toml
index 5f0e4f353c..8ea63c1b5c 100644
--- a/site/gatsby-site/netlify.toml
+++ b/site/gatsby-site/netlify.toml
@@ -1,3 +1,7 @@
+[build.environment]
+CYPRESS_CACHE_FOLDER = "./node_modules/CypressBinary"
+TERM = "xterm"
+
 [[plugins]]
   package = "@netlify/plugin-gatsby"
 
@@ -5,7 +9,19 @@
   package = "/plugins/netlify-plugin-create-admin-user"
 
 [[plugins]]
-  package = "/plugins/netlify-plugin-process-notifications"
+  package = "netlify-plugin-cypress"
+  [plugins.inputs]
+    enable = false
+  [plugins.inputs.postBuild]
+    enable = true
+    record = false
+    spa = true
+    start = 'gatsby serve -p 8080'
+    browser = 'chromium'
+
+# tmp disable
+# [[plugins]]
+#   package = "/plugins/netlify-plugin-process-notifications"
 
 [build.processing.html]
   pretty_urls = false
\ No newline at end of file