diff --git a/src/Handler.php b/src/Handler.php
index cfd748463617402b9a6c929485a7eda89a5eac0f..f427b84fa446bf30275876fa1f84a9aaafd63678 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -186,7 +186,7 @@ class Handler extends BaseHandler {
       ],
       'cypress' => [
         'enable' => $this->env->receiveGlobal('CYPRESS', 'Cypress', '0'),
-        'version' => '10.10.0',
+        'version' => '11.1.0',
       ],
     ];
   }
@@ -557,6 +557,23 @@ class Handler extends BaseHandler {
         'dest' => $projectRoot . '/tests',
       ],
     ];
+    if ($this->config->readValue(['cypress', 'enable'])) {
+      $files['cypress.config.js'] = [
+        'source' => 'tests/',
+        'dest' => $projectRoot . '/tests',
+        'add2git' => TRUE,
+      ];
+      $files['commands.js'] = [
+        'source' => 'tests/cypress/support/',
+        'dest' => $projectRoot . '/tests/cypress/support',
+        'add2git' => TRUE,
+      ];
+      $files['e2e.js'] = [
+        'source' => 'tests/cypress/support/',
+        'dest' => $projectRoot . '/tests/cypress/support',
+        'add2git' => TRUE,
+      ];
+    }
     if (getenv('LAKEDROPS_BUILD_NG') === 'yes') {
       if ($this->config->readValue(['backup', 'enable'])) {
         $files['config.yaml'] = [
diff --git a/templates/tests/cypress.config.js.twig b/templates/tests/cypress.config.js.twig
new file mode 100644
index 0000000000000000000000000000000000000000..b8824172886e9f9bb70dfc3a150cfeee61d535da
--- /dev/null
+++ b/templates/tests/cypress.config.js.twig
@@ -0,0 +1,10 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    watchForFileChanges: false,
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+  }
+})
diff --git a/templates/tests/cypress/support/commands.js.twig b/templates/tests/cypress/support/commands.js.twig
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/templates/tests/cypress/support/e2e.js.twig b/templates/tests/cypress/support/e2e.js.twig
new file mode 100644
index 0000000000000000000000000000000000000000..45530a3e1395b02ebdbb09df46a28f5ccfc3b7f6
--- /dev/null
+++ b/templates/tests/cypress/support/e2e.js.twig
@@ -0,0 +1,2 @@
+import '/e2escaffold/commands'
+import './commands'