diff --git a/apps/login/package.json b/apps/login/package.json
index 471a2504e9..da1f1379f9 100644
--- a/apps/login/package.json
+++ b/apps/login/package.json
@@ -1,7 +1,6 @@
 {
   "packageManager": "pnpm@10.13.1",
   "name": "@zitadel/login",
-  "version": "4.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3002 -H 0.0.0.0",
diff --git a/nx.json b/nx.json
index 0845d71012..df9f94604f 100644
--- a/nx.json
+++ b/nx.json
@@ -1,87 +1,41 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "defaultBase": "next",
   "release": {
-  "projects": [
-    "@zitadel/login",
-    "@zitadel/console",
-    "@zitadel/api",
-    "@zitadel/docs"
-  ],
-  "changelog": {
-    "workspaceChangelog": {
-      "file": false,
-      "createRelease": "github"
+    "projects": [
+      "@zitadel/login",
+      "@zitadel/console",
+      "@zitadel/api",
+      "@zitadel/docs"
+    ],
+    "changelog": {
+      "workspaceChangelog": {
+        "file": false,
+        "createRelease": "github"
+      }
+    },
+    "projectsRelationship": "fixed",
+    "version": {
+      "conventionalCommits": true
+    },
+    "releaseTagPattern": "v{version}",
+    "releaseTagPatternCheckAllBranchesWhen": true,
+    "docker": {
+      "skipVersionActions": true,
+      "registryUrl": "ghcr.io",
+      "groupPreVersionCommand": "echo BEFORE VERSIONING"
+    },
+    "dockerVersionScheme": {
+      "production": "{currentDate|YYMM.DD}.{shortCommitSha}",
+      "staging": "{currentDate|YYMM.DD}-staging.{shortCommitSha}"
     }
   },
-  "projectsRelationship": "fixed",
-  "version": {
-    "conventionalCommits": true,
-    "fallbackCurrentVersionResolver": "disk"
-  },
-  "releaseTagPattern": "v{version}",
-  "docker": {
-    "skipVersionActions": true,
-    "registryUrl": "ghcr.io",
-    "groupPreVersionCommand": "echo BEFORE VERSIONING"
-  },
-  "dockerVersionScheme": {
-    "production": "{currentDate|YYMM.DD}.{shortCommitSha}",
-    "staging": "{currentDate|YYMM.DD}-staging.{shortCommitSha}"
-  }
-},
   "namedInputs": {
     "proto": [
       "{workspaceRoot}/proto/**"
     ],
     "sharedGlobals": [
-      "{workspaceRoot}/**/.env.*local",
-      {
-        "env": "DEBUG"
-      },
-      {
-        "env": "VERCEL_URL"
-      },
-      {
-        "env": "EMAIL_VERIFICATION"
-      },
-      {
-        "env": "AUDIENCE"
-      },
-      {
-        "env": "SYSTEM_USER_ID"
-      },
-      {
-        "env": "SYSTEM_USER_PRIVATE_KEY"
-      },
-      {
-        "env": "ZITADEL_API_URL"
-      },
-      {
-        "env": "ZITADEL_SERVICE_USER_TOKEN"
-      },
-      {
-        "env": "NEXT_PUBLIC_BASE_PATH"
-      },
-      {
-        "env": "CUSTOM_REQUEST_HEADERS"
-      },
-      {
-        "env": "NODE_ENV"
-      },
-      {
-        "env": "PORT"
-      },
-      {
-        "env": "INKEEP_API_KEY"
-      },
-      {
-        "env": "DISPLAY"
-      },
-      {
-        "env": "CYPRESS_DISPLAY"
-      }
-    ],
+      "{workspaceRoot}/**/.env.*local"
+      ],
     "default": [
       "{projectRoot}/**/*",
       "sharedGlobals",