diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 560afffbe4..c9b10e11e6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,11 +47,8 @@ export ZITADEL_DEV_UID="$(id -u)"
 # Pull images
 docker compose --file ./acceptance/docker-compose.yaml pull
 
-# Run ZITADEL and configure ./apps/login/.env.local
-docker compose --file ./acceptance/docker-compose.yaml run setup
-
-# Configure your shell to use the environment variables written to ./apps/login/.env.acceptance
-export $(cat ./apps/login/.env.acceptance | xargs)
+# Run ZITADEL with local notification sink and configure ./apps/login/.env.local
+pnpm run-sink
 ```
 
 ### Developing Against Your ZITADEL Cloud Instance
@@ -79,6 +76,23 @@ pnpm dev
 
 The application is now available at `http://localhost:3000`
 
+### Adding applications and IDPs
+
+```sh
+# OPTIONAL Run SAML SP 
+pnpm run-samlsp
+
+# OPTIONAL Run OIDC RP
+pnpm run-oidcrp
+
+# OPTIONAL Run SAML IDP
+pnpm run-samlidp
+
+# OPTIONAL Run OIDC OP
+pnpm run-oidcop
+```
+
+
 ### Testing
 
 You can execute the following commands `pnpm test` for a single test run or `pnpm test:watch` in the following directories:
diff --git a/acceptance/tests/oidc-username-password.spec.ts b/acceptance/tests/oidc-username-password.spec.ts
index eba368f8ef..a33e2f9f6c 100644
--- a/acceptance/tests/oidc-username-password.spec.ts
+++ b/acceptance/tests/oidc-username-password.spec.ts
@@ -1,37 +1,38 @@
-import { faker } from "@faker-js/faker";
-import { test as base, expect } from "@playwright/test";
+import {faker} from "@faker-js/faker";
+import {test as base} from "@playwright/test";
 import dotenv from "dotenv";
 import path from "path";
-import { loginname } from "./loginname";
-import { startOIDC } from "./oidc";
-import { password } from "./password";
-import { PasswordUser } from "./user";
+import {PasswordUser} from "./user";
 
 // Read from ".env" file.
-dotenv.config({ path: path.resolve(__dirname, ".env.local") });
+dotenv.config({path: path.resolve(__dirname, ".env.local")});
 
 const test = base.extend<{ user: PasswordUser }>({
-  user: async ({ page }, use) => {
-    const user = new PasswordUser({
-      email: faker.internet.email(),
-      isEmailVerified: true,
-      firstName: faker.person.firstName(),
-      lastName: faker.person.lastName(),
-      organization: "",
-      phone: faker.phone.number(),
-      isPhoneVerified: false,
-      password: "Password1!",
-      passwordChangeRequired: false,
-    });
-    await user.ensure(page);
-    await use(user);
-    await user.cleanup();
-  },
+    user: async ({page}, use) => {
+        const user = new PasswordUser({
+            email: faker.internet.email(),
+            isEmailVerified: true,
+            firstName: faker.person.firstName(),
+            lastName: faker.person.lastName(),
+            organization: "",
+            phone: faker.phone.number(),
+            isPhoneVerified: false,
+            password: "Password1!",
+            passwordChangeRequired: false,
+        });
+        await user.ensure(page);
+        await use(user);
+        await user.cleanup();
+    },
 });
 
-test("oidc username and password login", async ({ user, page }) => {
-  await startOIDC(page);
-  await loginname(page, user.getUsername());
-  await password(page, user.getPassword());
-  await expect(page.locator("pre")).toContainText(user.getUsername());
+test("oidc username and password login", async ({user, page}) => {
+//TODO commented out because of relocating into E2E tests
+    /*
+    await startOIDC(page);
+    await loginname(page, user.getUsername());
+    await password(page, user.getPassword());
+    await expect(page.locator("pre")).toContainText(user.getUsername());
+
+     */
 });
diff --git a/packages/zitadel-proto/package.json b/packages/zitadel-proto/package.json
index 20f8cd6c57..50c8342287 100644
--- a/packages/zitadel-proto/package.json
+++ b/packages/zitadel-proto/package.json
@@ -14,7 +14,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "generate": "buf generate https://github.com/zitadel/zitadel.git#tag=v2.71.6 --path ./proto/zitadel",
+    "generate": "buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel",
     "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate"
   },
   "dependencies": {