diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
index e2117906de47ef..6eee3879065877 100644
--- a/docs/generated/manifests/menus.json
+++ b/docs/generated/manifests/menus.json
@@ -7003,6 +7003,55 @@
             ],
             "isExternal": false,
             "disableCollapsible": false
+          },
+          {
+            "id": "generators",
+            "path": "/nx-api/cypress/generators",
+            "name": "generators",
+            "children": [
+              {
+                "id": "init",
+                "path": "/nx-api/cypress/generators/init",
+                "name": "init",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "configuration",
+                "path": "/nx-api/cypress/generators/configuration",
+                "name": "configuration",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "component-configuration",
+                "path": "/nx-api/cypress/generators/component-configuration",
+                "name": "component-configuration",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "migrate-to-cypress-11",
+                "path": "/nx-api/cypress/generators/migrate-to-cypress-11",
+                "name": "migrate-to-cypress-11",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              },
+              {
+                "id": "convert-to-inferred",
+                "path": "/nx-api/cypress/generators/convert-to-inferred",
+                "name": "convert-to-inferred",
+                "children": [],
+                "isExternal": false,
+                "disableCollapsible": false
+              }
+            ],
+            "isExternal": false,
+            "disableCollapsible": false
           }
         ],
         "isExternal": false,
diff --git a/docs/generated/manifests/nx-api.json b/docs/generated/manifests/nx-api.json
index cd79edcd576d00..421897903d911a 100644
--- a/docs/generated/manifests/nx-api.json
+++ b/docs/generated/manifests/nx-api.json
@@ -500,7 +500,53 @@
         "type": "executor"
       }
     },
-    "generators": {},
+    "generators": {
+      "/nx-api/cypress/generators/init": {
+        "description": "Initialize the `@nrwl/cypress` plugin.",
+        "file": "generated/packages/cypress/generators/init.json",
+        "hidden": true,
+        "name": "init",
+        "originalFilePath": "/packages/cypress/src/generators/init/schema.json",
+        "path": "/nx-api/cypress/generators/init",
+        "type": "generator"
+      },
+      "/nx-api/cypress/generators/configuration": {
+        "description": "Add a Cypress E2E Configuration to an existing project.",
+        "file": "generated/packages/cypress/generators/configuration.json",
+        "hidden": false,
+        "name": "configuration",
+        "originalFilePath": "/packages/cypress/src/generators/configuration/schema.json",
+        "path": "/nx-api/cypress/generators/configuration",
+        "type": "generator"
+      },
+      "/nx-api/cypress/generators/component-configuration": {
+        "description": "Set up Cypress Component Test for a project",
+        "file": "generated/packages/cypress/generators/component-configuration.json",
+        "hidden": true,
+        "name": "component-configuration",
+        "originalFilePath": "/packages/cypress/src/generators/component-configuration/schema.json",
+        "path": "/nx-api/cypress/generators/component-configuration",
+        "type": "generator"
+      },
+      "/nx-api/cypress/generators/migrate-to-cypress-11": {
+        "description": "Migrate existing Cypress e2e projects to Cypress v11",
+        "file": "generated/packages/cypress/generators/migrate-to-cypress-11.json",
+        "hidden": false,
+        "name": "migrate-to-cypress-11",
+        "originalFilePath": "/packages/cypress/src/generators/migrate-to-cypress-11/schema.json",
+        "path": "/nx-api/cypress/generators/migrate-to-cypress-11",
+        "type": "generator"
+      },
+      "/nx-api/cypress/generators/convert-to-inferred": {
+        "description": "Convert existing Cypress project(s) using `@nx/cypress:cypress` executor to use `@nx/cypress/plugin`.",
+        "file": "generated/packages/cypress/generators/convert-to-inferred.json",
+        "hidden": false,
+        "name": "convert-to-inferred",
+        "originalFilePath": "/packages/cypress/src/generators/convert-to-inferred/schema.json",
+        "path": "/nx-api/cypress/generators/convert-to-inferred",
+        "type": "generator"
+      }
+    },
     "path": "/nx-api/cypress"
   },
   "detox": {
diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
index 10499b670ae68c..eadfab0447c713 100644
--- a/docs/generated/packages-metadata.json
+++ b/docs/generated/packages-metadata.json
@@ -492,7 +492,53 @@
         "type": "executor"
       }
     ],
-    "generators": [],
+    "generators": [
+      {
+        "description": "Initialize the `@nrwl/cypress` plugin.",
+        "file": "generated/packages/cypress/generators/init.json",
+        "hidden": true,
+        "name": "init",
+        "originalFilePath": "/packages/cypress/src/generators/init/schema.json",
+        "path": "cypress/generators/init",
+        "type": "generator"
+      },
+      {
+        "description": "Add a Cypress E2E Configuration to an existing project.",
+        "file": "generated/packages/cypress/generators/configuration.json",
+        "hidden": false,
+        "name": "configuration",
+        "originalFilePath": "/packages/cypress/src/generators/configuration/schema.json",
+        "path": "cypress/generators/configuration",
+        "type": "generator"
+      },
+      {
+        "description": "Set up Cypress Component Test for a project",
+        "file": "generated/packages/cypress/generators/component-configuration.json",
+        "hidden": true,
+        "name": "component-configuration",
+        "originalFilePath": "/packages/cypress/src/generators/component-configuration/schema.json",
+        "path": "cypress/generators/component-configuration",
+        "type": "generator"
+      },
+      {
+        "description": "Migrate existing Cypress e2e projects to Cypress v11",
+        "file": "generated/packages/cypress/generators/migrate-to-cypress-11.json",
+        "hidden": false,
+        "name": "migrate-to-cypress-11",
+        "originalFilePath": "/packages/cypress/src/generators/migrate-to-cypress-11/schema.json",
+        "path": "cypress/generators/migrate-to-cypress-11",
+        "type": "generator"
+      },
+      {
+        "description": "Convert existing Cypress project(s) using `@nx/cypress:cypress` executor to use `@nx/cypress/plugin`.",
+        "file": "generated/packages/cypress/generators/convert-to-inferred.json",
+        "hidden": false,
+        "name": "convert-to-inferred",
+        "originalFilePath": "/packages/cypress/src/generators/convert-to-inferred/schema.json",
+        "path": "cypress/generators/convert-to-inferred",
+        "type": "generator"
+      }
+    ],
     "githubRoot": "https://github.com/nrwl/nx/blob/master",
     "name": "cypress",
     "packageName": "@nx/cypress",
diff --git a/docs/generated/packages/cypress/generators/component-configuration.json b/docs/generated/packages/cypress/generators/component-configuration.json
new file mode 100644
index 00000000000000..e089357ceeb687
--- /dev/null
+++ b/docs/generated/packages/cypress/generators/component-configuration.json
@@ -0,0 +1,52 @@
+{
+  "name": "component-configuration",
+  "aliases": ["cypress-component-configuration"],
+  "factory": "./src/generators/component-configuration/component-configuration#componentConfigurationGeneratorInternal",
+  "schema": {
+    "$schema": "https://json-schema.org/schema",
+    "$id": "NxCypressComponentConfiguration",
+    "cli": "nx",
+    "title": "Set up Cypress component testing for a project",
+    "description": "Set up Cypress component test for a project.",
+    "type": "object",
+    "examples": [
+      {
+        "command": "nx g @nx/cypress:component-configuration --project=my-cool-lib ",
+        "description": "Add cypress component testing to an existing project named my-cool-lib"
+      }
+    ],
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The name of the project to add cypress component testing to",
+        "$default": { "$source": "projectName" },
+        "x-prompt": "What project should we add Cypress component testing to?"
+      },
+      "bundler": {
+        "description": "The Cypress bundler to use.",
+        "type": "string",
+        "enum": ["vite", "webpack"],
+        "x-prompt": "Which Cypress bundler do you want to use for the dev-server?",
+        "default": "webpack"
+      },
+      "directory": {
+        "type": "string",
+        "description": "A directory where the project is placed relative from the project root",
+        "default": "cypress"
+      },
+      "jsx": {
+        "description": "Whether or not this project uses JSX.",
+        "type": "boolean",
+        "default": true
+      }
+    },
+    "required": ["project"],
+    "examplesFile": "This is a framework-agnostic generator for adding component testing to a project.\n\n```bash\nnx g cypress-component-configuration --project=my-cool-project\n```\n\nRunning this generator, adds the required files to the specified project without any configurations for Cypress. It's best to use the framework specific generator, instead `cypress-component-configuration` directly\n\n- [React component testing](/packages/react/generators/cypress-component-configuration)\n- [Angular component testing](/packages/angular/generators/cypress-component-configuration)\n\nA new `component-test` target will be added to the specified project.\n\n```bash\nnx g component-test my-cool-project\n```\n\nRead more about [Cypress Component Testing](/cypress/cypress-component-testing)\n",
+    "presets": []
+  },
+  "description": "Set up Cypress Component Test for a project",
+  "hidden": true,
+  "implementation": "/packages/cypress/src/generators/component-configuration/component-configuration#componentConfigurationGeneratorInternal.ts",
+  "path": "/packages/cypress/src/generators/component-configuration/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/cypress/generators/configuration.json b/docs/generated/packages/cypress/generators/configuration.json
new file mode 100644
index 00000000000000..4925f64b63b008
--- /dev/null
+++ b/docs/generated/packages/cypress/generators/configuration.json
@@ -0,0 +1,100 @@
+{
+  "name": "configuration",
+  "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"],
+  "factory": "./src/generators/configuration/configuration#configurationGeneratorInternal",
+  "schema": {
+    "$schema": "https://json-schema.org/schema",
+    "$id": "NxCypressE2EConfigGenerator",
+    "cli": "nx",
+    "title": "Add a Cypress Configuration.",
+    "description": "Add a Cypress configuration to an existing project.",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The project to add a Cypress configuration to",
+        "$default": { "$source": "projectName" },
+        "x-priority": "important",
+        "x-prompt": "What project do you want to add Cypress to?"
+      },
+      "devServerTarget": {
+        "type": "string",
+        "description": "A devServerTarget,'<projectName>:<targetName>[:<configName>], that will be used to run tests against. This is usually the app this project will be used in. Pass --baseUrl if you wish to not use a devServerTarget.",
+        "x-priority": "important"
+      },
+      "port": {
+        "oneOf": [
+          { "type": "string", "enum": ["cypress-auto"] },
+          { "type": "number" }
+        ],
+        "description": "Set the 'port' option on the e2e target. It's recommend to set a different port so you can run tests e2e targets in parallel. Most dev servers support using '0' to automatically find a free port. The value 'cypress-auto' can be used if the underlying dev server does not support automatically finding a free port.",
+        "x-priority": "important"
+      },
+      "baseUrl": {
+        "type": "string",
+        "description": "The address (with the port) which your application is running on. If you wish to start your application when running the e2e target, then use --devServerTarget instead."
+      },
+      "directory": {
+        "type": "string",
+        "description": "A directory where the project is placed relative from the project root",
+        "x-priority": "important",
+        "default": "cypress"
+      },
+      "linter": {
+        "description": "The tool to use for running lint checks.",
+        "type": "string",
+        "enum": ["eslint", "none"],
+        "default": "eslint"
+      },
+      "js": {
+        "description": "Generate JavaScript files rather than TypeScript files.",
+        "type": "boolean",
+        "default": false
+      },
+      "skipFormat": {
+        "description": "Skip formatting files.",
+        "type": "boolean",
+        "default": false,
+        "x-priority": "internal"
+      },
+      "setParserOptionsProject": {
+        "type": "boolean",
+        "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+        "default": false
+      },
+      "skipPackageJson": {
+        "type": "boolean",
+        "default": false,
+        "description": "Do not add dependencies to `package.json`.",
+        "x-priority": "internal"
+      },
+      "rootProject": {
+        "description": "Create a application at the root of the workspace",
+        "type": "boolean",
+        "default": false,
+        "hidden": true,
+        "x-priority": "internal"
+      },
+      "bundler": {
+        "description": "The Cypress bundler to use.",
+        "type": "string",
+        "enum": ["vite", "webpack", "none"],
+        "x-prompt": "Which Cypress bundler do you want to use?",
+        "default": "webpack"
+      },
+      "jsx": {
+        "description": "Whether or not this project uses JSX.",
+        "type": "boolean",
+        "default": true
+      }
+    },
+    "required": ["project"],
+    "examplesFile": "This is a generator to add a cypress e2e configuration to an existing project.\n\n```bash\nnx g @nx/cypress:configuration --project=my-cool-project --devServerTarget=some-app:serve\n```\n\nRunning this generator, adds the required files to run cypress tests for a project,\nMainly a `cypress.config.ts` file and default files in the `<project-root>/cypress/` directory.\nTests will be located in `<project-root>/cypress/e2e/*` by default.\n\nYou can customize the directory used via the `--directory` flag, the value is relative to the project root.\n\nFor example if you wanted to place the files inside an `e2e` folder\n\n```bash\nnx g @nx/cypress:configuration --project=my-cool-project --devServerTarget=some-app:serve --directory=e2e\n```\n\nProviding a `--devServerTarget` is optional if you provide a `--baseUrl` or the project you're adding the configuration to has a `serve` target already.\nOtherwise, a `--devServerTarget` is recommend for the `@nx/cypress:cypress` executor to spin up the dev server for you automatically when needed.\n\n## Feature Based Testing\n\nThis generator helps in creating feature based e2e/integration testing setups where you can place the feature tests in the same project as the feature library.\nThis differs from creating a separate e2e project that contained all tests for an application which can easily cause more tests to run than is strictly necessary.\n\nTake the following workspace where the `feature-cart` project is affected.\n\n{% graph height=\"450px\" %}\n\n```json\n{\n  \"projects\": [\n    {\n      \"type\": \"app\",\n      \"name\": \"fancy-app\",\n      \"data\": {\n        \"tags\": []\n      }\n    },\n    {\n      \"type\": \"app\",\n      \"name\": \"fancy-app-e2e\",\n      \"data\": {\n        \"tags\": []\n      }\n    },\n    {\n      \"type\": \"lib\",\n      \"name\": \"feature-user\",\n      \"data\": {\n        \"tags\": []\n      }\n    },\n    {\n      \"type\": \"lib\",\n      \"name\": \"feature-dashboard\",\n      \"data\": {\n        \"tags\": []\n      }\n    },\n    {\n      \"type\": \"lib\",\n      \"name\": \"feature-cart\",\n      \"data\": {\n        \"tags\": []\n      }\n    }\n  ],\n  \"groupByFolder\": false,\n  \"workspaceLayout\": {\n    \"appsDir\": \"apps\",\n    \"libsDir\": \"libs\"\n  },\n  \"dependencies\": {\n    \"fancy-app\": [\n      {\n        \"target\": \"feature-user\",\n        \"source\": \"fancy-app\",\n        \"type\": \"static\"\n      },\n      {\n        \"target\": \"feature-cart\",\n        \"source\": \"fancy-app\",\n        \"type\": \"static\"\n      }\n    ],\n    \"fancy-app-e2e\": [\n      {\n        \"target\": \"fancy-app\",\n        \"source\": \"fancy-app-e2e\",\n        \"type\": \"implicit\"\n      }\n    ],\n    \"feature-user\": [\n      {\n        \"target\": \"feature-dashboard\",\n        \"source\": \"feature-user\",\n        \"type\": \"direct\"\n      }\n    ],\n    \"feature-cart\": [],\n    \"feature-dashboard\": []\n  },\n  \"affectedProjectIds\": [\"feature-cart\", \"fancy-app\", \"fancy-app-e2e\"]\n}\n```\n\n{% /graph %}\n\nIn this case, if tests for the all the `feature-*` projects where contained in the `fancy-app-e2e` project, then all of those features will be tested in the app, when only the `feature-cart` tests need to run.\n\nRunning these e2e/integration tests more often than they should results in longer CI times.\n\nBrining those e2e test closer to each feature can result is lowering CI times since we don't need to test those features if they did not change.\n\nBuilding this way leaves the `fancy-app-e2e` for mostly smoke type testing instead of more in-depth feature testing.\n\nUsing the `@nx/cypress:configuration` generator can help you accomplish this in your workspace.\n\n```bash\nnx g @nx/cypress:configuration --project=feature-cart --devServerTarget=fancy-app:serve\nnx g @nx/cypress:configuration --project=feature-user --devServerTarget=fancy-app:serve\nnx g @nx/cypress:configuration --project=feature-dashboard --devServerTarget=fancy-app:serve\n```\n\nEach project will now get their own `e2e` target, where the feature project is only concerned with itself. This allows for more focused tests without worrying about forcing unrelated tests to also run.\n\nIt's important to remember that these feature tests are still going to be leveraging the same app to run the tests against so if you plan to run in parallel, you can leverage using a file server and the ability for `@nx/cypress:cypress` executor to pass through a port or find a free port to allow running tests in parallel. Read more [about the --port flag](/packages/cypress/executors/cypress#port)\n",
+    "presets": []
+  },
+  "description": "Add a Cypress E2E Configuration to an existing project.",
+  "implementation": "/packages/cypress/src/generators/configuration/configuration#configurationGeneratorInternal.ts",
+  "hidden": false,
+  "path": "/packages/cypress/src/generators/configuration/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/cypress/generators/convert-to-inferred.json b/docs/generated/packages/cypress/generators/convert-to-inferred.json
new file mode 100644
index 00000000000000..9bc978de16109f
--- /dev/null
+++ b/docs/generated/packages/cypress/generators/convert-to-inferred.json
@@ -0,0 +1,30 @@
+{
+  "name": "convert-to-inferred",
+  "factory": "./src/generators/convert-to-inferred/convert-to-inferred",
+  "schema": {
+    "$schema": "https://json-schema.org/schema",
+    "$id": "NxCypressConvertToInferred",
+    "description": "Convert existing Cypress project(s) using `@nx/cypress:cypress` executor to use `@nx/cypress/plugin`.",
+    "title": "Convert Cypress project from executor to plugin",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The project to convert from using the `@nx/cypress:cypress` executor to use `@nx/cypress/plugin`.",
+        "x-priority": "important"
+      },
+      "skipFormat": {
+        "type": "boolean",
+        "description": "Whether to format files at the end of the migration.",
+        "default": false
+      }
+    },
+    "presets": []
+  },
+  "description": "Convert existing Cypress project(s) using `@nx/cypress:cypress` executor to use `@nx/cypress/plugin`.",
+  "implementation": "/packages/cypress/src/generators/convert-to-inferred/convert-to-inferred.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/cypress/src/generators/convert-to-inferred/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/cypress/generators/init.json b/docs/generated/packages/cypress/generators/init.json
new file mode 100644
index 00000000000000..7a383e52da2984
--- /dev/null
+++ b/docs/generated/packages/cypress/generators/init.json
@@ -0,0 +1,45 @@
+{
+  "name": "init",
+  "factory": "./src/generators/init/init#cypressInitGeneratorInternal",
+  "schema": {
+    "$schema": "https://json-schema.org/schema",
+    "$id": "NxCypressInit",
+    "cli": "nx",
+    "title": "Add Cypress Configuration to the workspace",
+    "description": "Add Cypress Configuration to the workspace.",
+    "type": "object",
+    "properties": {
+      "skipFormat": {
+        "description": "Skip formatting files.",
+        "type": "boolean",
+        "default": false,
+        "x-priority": "internal"
+      },
+      "skipPackageJson": {
+        "type": "boolean",
+        "default": false,
+        "description": "Do not add dependencies to `package.json`.",
+        "x-priority": "internal"
+      },
+      "keepExistingVersions": {
+        "type": "boolean",
+        "x-priority": "internal",
+        "description": "Keep existing dependencies versions",
+        "default": false
+      },
+      "updatePackageScripts": {
+        "type": "boolean",
+        "x-priority": "internal",
+        "description": "Update `package.json` scripts with inferred targets",
+        "default": false
+      }
+    },
+    "presets": []
+  },
+  "description": "Initialize the `@nrwl/cypress` plugin.",
+  "aliases": ["ng-add"],
+  "hidden": true,
+  "implementation": "/packages/cypress/src/generators/init/init#cypressInitGeneratorInternal.ts",
+  "path": "/packages/cypress/src/generators/init/schema.json",
+  "type": "generator"
+}
diff --git a/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json b/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json
new file mode 100644
index 00000000000000..79704fcfe0d0dc
--- /dev/null
+++ b/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json
@@ -0,0 +1,26 @@
+{
+  "name": "migrate-to-cypress-11",
+  "factory": "./src/generators/migrate-to-cypress-11/migrate-to-cypress-11#migrateCypressProject",
+  "schema": {
+    "$schema": "https://json-schema.org/schema",
+    "$id": "NxCypressMigrateTo11",
+    "cli": "nx",
+    "title": "Migrate e2e project to Cypress 11",
+    "description": "Migrate Cypress e2e project from v8/v9 to Cypress v11.",
+    "type": "object",
+    "examples": [
+      {
+        "command": "nx g @nx/cypress:migrate-to-cypress-11",
+        "description": "Migrate existing cypress projects to Cypress v11"
+      }
+    ],
+    "properties": {},
+    "presets": []
+  },
+  "description": "Migrate existing Cypress e2e projects to Cypress v11",
+  "implementation": "/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11#migrateCypressProject.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/cypress/src/generators/migrate-to-cypress-11/schema.json",
+  "type": "generator"
+}
diff --git a/docs/shared/reference/sitemap.md b/docs/shared/reference/sitemap.md
index 45f2a8a0bd4ded..7ce95869bfa119 100644
--- a/docs/shared/reference/sitemap.md
+++ b/docs/shared/reference/sitemap.md
@@ -366,6 +366,12 @@
       - [Overview](/nx-api/cypress/documents/overview)
     - [executors](/nx-api/cypress/executors)
       - [cypress](/nx-api/cypress/executors/cypress)
+    - [generators](/nx-api/cypress/generators)
+      - [init](/nx-api/cypress/generators/init)
+      - [configuration](/nx-api/cypress/generators/configuration)
+      - [component-configuration](/nx-api/cypress/generators/component-configuration)
+      - [migrate-to-cypress-11](/nx-api/cypress/generators/migrate-to-cypress-11)
+      - [convert-to-inferred](/nx-api/cypress/generators/convert-to-inferred)
   - [detox](/nx-api/detox)
     - [documents](/nx-api/detox/documents)
       - [Overview](/nx-api/detox/documents/overview)
diff --git a/e2e/webpack/src/webpack.test.ts b/e2e/webpack/src/webpack.test.ts
index a86ad666903dcc..6f6ffb3ad59970 100644
--- a/e2e/webpack/src/webpack.test.ts
+++ b/e2e/webpack/src/webpack.test.ts
@@ -164,22 +164,18 @@ describe('Webpack Plugin', () => {
     expect(output).toMatch(/Hello/);
   }, 500_000);
 
-  it('should bundle in non-sensitive NX_ environment variables', () => {
+  it('should bundle in NX_PUBLIC_ environment variables', () => {
     const appName = uniq('app');
     runCLI(`generate @nx/web:app ${appName} --bundler webpack`);
     updateFile(
       `apps/${appName}/src/main.ts`,
       `
-      console.log(process.env['NX_CLOUD_ENCRYPTION_KEY']);
-      console.log(process.env['NX_CLOUD_ACCESS_TOKEN']);
       console.log(process.env['NX_PUBLIC_TEST']);
       `
     );
 
     runCLI(`build ${appName}`, {
       env: {
-        NX_CLOUD_ENCRYPTION_KEY: 'secret',
-        NX_CLOUD_ACCESS_TOKEN: 'secret',
         NX_PUBLIC_TEST: 'foobar',
       },
     });
@@ -188,7 +184,6 @@ describe('Webpack Plugin', () => {
       f.startsWith('main.')
     );
     const content = readFile(`dist/apps/${appName}/${mainFile}`);
-    expect(content).not.toMatch(/secret/);
     expect(content).toMatch(/foobar/);
   });
 
diff --git a/packages/cypress/generators.json b/packages/cypress/generators.json
index 113ad18782e218..6506e6db058ffc 100644
--- a/packages/cypress/generators.json
+++ b/packages/cypress/generators.json
@@ -9,12 +9,6 @@
       "aliases": ["ng-add"],
       "hidden": true
     },
-    "cypress-project": {
-      "factory": "./src/generators/cypress-project/cypress-project#cypressProjectGeneratorInternal",
-      "schema": "./src/generators/cypress-project/schema.json",
-      "description": "Add a Cypress E2E Project.",
-      "hidden": true
-    },
     "configuration": {
       "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"],
       "factory": "./src/generators/configuration/configuration#configurationGeneratorInternal",
diff --git a/packages/webpack/src/utils/webpack/interpolate-env-variables-to-index.spec.ts b/packages/webpack/src/utils/webpack/interpolate-env-variables-to-index.spec.ts
index 45fda63c15483c..00f5fdce1aee98 100644
--- a/packages/webpack/src/utils/webpack/interpolate-env-variables-to-index.spec.ts
+++ b/packages/webpack/src/utils/webpack/interpolate-env-variables-to-index.spec.ts
@@ -2,7 +2,7 @@ import { interpolateEnvironmentVariablesToIndex } from './interpolate-env-variab
 
 describe('interpolateEnvironmentVariablesToIndex()', () => {
   const envDefaults = {
-    NX_VARIABLE: 'foo',
+    NX_PUBLIC_VARIABLE: 'foo',
     SOME_OTHER_VARIABLE: 'bar',
     DEPLOY_URL: 'baz',
   };
@@ -14,7 +14,7 @@ describe('interpolateEnvironmentVariablesToIndex()', () => {
 
   test('default env variables', () => {
     const content = `
-<div>Nx Variable: %NX_VARIABLE%</div>
+<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
 <div>Some other variable: %SOME_OTHER_VARIABLE%</div>
 <div>Deploy Url: %DEPLOY_URL%</div>
 `;
@@ -28,7 +28,7 @@ describe('interpolateEnvironmentVariablesToIndex()', () => {
 
   test('Deploy url set as option overrides DEPLOY_URL env variable', () => {
     const content = `
-<div>Nx Variable: %NX_VARIABLE%</div>
+<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
 <div>Some other variable: %SOME_OTHER_VARIABLE%</div>
 <div>Deploy Url: %DEPLOY_URL%</div>
 `;
@@ -45,7 +45,7 @@ describe('interpolateEnvironmentVariablesToIndex()', () => {
   test('No deploy url provided via either option', () => {
     delete process.env.DEPLOY_URL;
     const content = `
-<div>Nx Variable: %NX_VARIABLE%</div>
+<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
 <div>Some other variable: %SOME_OTHER_VARIABLE%</div>
 <div>Deploy Url: %DEPLOY_URL%</div>
 `;
@@ -60,7 +60,7 @@ describe('interpolateEnvironmentVariablesToIndex()', () => {
   test('NX_ prefixed option present in index.html, but not present in process.env', () => {
     delete process.env.DEPLOY_URL;
     const content = `
-<div>Nx Variable: %NX_VARIABLE%</div>
+<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
 <div>Some other variable: %SOME_OTHER_VARIABLE%</div>
 <div>Some other nx_variable: %NX_SOME_OTHER_VARIABLE%</div>
 <div>Deploy Url: %DEPLOY_URL%</div>