diff --git a/tests/govtool-frontend/playwright/lib/pages/proposalSubmissionPage.ts b/tests/govtool-frontend/playwright/lib/pages/proposalSubmissionPage.ts
index 103675b4e..9113279c1 100644
--- a/tests/govtool-frontend/playwright/lib/pages/proposalSubmissionPage.ts
+++ b/tests/govtool-frontend/playwright/lib/pages/proposalSubmissionPage.ts
@@ -150,21 +150,30 @@ export default class ProposalSubmissionPage {
   }
 
   async getAllDrafts() {
-    await this.page.waitForTimeout(2_000); // wait until draft is loaded
+    await expect(
+      this.page.locator('[data-testid^="draft-"][data-testid$="-card"]')
+    ).toBeVisible({ timeout: 10_000 }); // slow rendering
+
     return await this.page
       .locator('[data-testid^="draft-"][data-testid$="-card"]')
       .all();
   }
 
   async getFirstDraft() {
-    await this.page.waitForTimeout(2_000); // wait until draft is loaded
+    await expect(
+      this.page.locator('[data-testid^="draft-"][data-testid$="-card"]')
+    ).toBeVisible({ timeout: 10_000 }); // slow rendering
+
     return this.page
       .locator('[data-testid^="draft-"][data-testid$="-card"]')
       .first();
   }
 
   async viewFirstDraft() {
-    await this.page.waitForTimeout(2_000); // wait until draft is loaded
+    await expect(
+      this.page.locator('[data-testid^="draft-"][data-testid$="-card"]')
+    ).toBeVisible({ timeout: 10_000 }); // slow rendering
+
     return await this.page
       .locator('[data-testid^="draft-"][data-testid$="-start-editing"]')
       .first()
diff --git a/tests/govtool-frontend/playwright/tests/7-proposal-submission/proposalSubmission.loggedin.spec.ts b/tests/govtool-frontend/playwright/tests/7-proposal-submission/proposalSubmission.loggedin.spec.ts
index d057e7601..2ab818007 100644
--- a/tests/govtool-frontend/playwright/tests/7-proposal-submission/proposalSubmission.loggedin.spec.ts
+++ b/tests/govtool-frontend/playwright/tests/7-proposal-submission/proposalSubmission.loggedin.spec.ts
@@ -375,7 +375,8 @@ test.describe("Temporary proposal users", () => {
 
     test.beforeEach(async () => {
       proposalSubmissionPage = new ProposalSubmissionPage(userPage);
-      await proposalSubmissionPage.goto();
+      await proposalSubmissionPage.proposalCreateBtn.click();
+      await proposalSubmissionPage.continueBtn.click();
 
       await proposalSubmissionPage.addLinkBtn.click();
       proposalFormValue =
diff --git a/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.loggedin.spec.ts b/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.loggedin.spec.ts
index 5eda4f35d..badc38fad 100644
--- a/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.loggedin.spec.ts
+++ b/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.loggedin.spec.ts
@@ -73,8 +73,8 @@ test.describe("Proposal created logged in state", () => {
 
 test.describe("Proposal created with poll enabled (user auth)", () => {
   test.use({
-    storageState: ".auth/user01.json",
-    wallet: user01Wallet,
+    storageState: ".auth/proposal02.json",
+    wallet: proposal02Wallet,
     pollEnabled: true,
   });
 
@@ -84,8 +84,6 @@ test.describe("Proposal created with poll enabled (user auth)", () => {
     proposalDiscussionDetailsPage = new ProposalDiscussionDetailsPage(page);
     await proposalDiscussionDetailsPage.goto(proposalId);
     await proposalDiscussionDetailsPage.verifyIdentityBtn.click();
-
-    await proposalDiscussionDetailsPage.closeUsernamePrompt();
   });
 
   test("8Q. Should vote on poll.", async ({ page }) => {