diff --git a/src/frontend/tests/extended/features/store-shard-1.spec.ts b/src/frontend/tests/extended/features/store-shard-1.spec.ts
index 7db30cba1..84089dca3 100644
--- a/src/frontend/tests/extended/features/store-shard-1.spec.ts
+++ b/src/frontend/tests/extended/features/store-shard-1.spec.ts
@@ -52,7 +52,14 @@ test("should like and add components and flows", async ({ page }) => {
   await page.waitForTimeout(1000);
 
   await page.getByTestId("button-store").click();
-  await page.waitForTimeout(5000);
+
+  await page.waitForSelector('[data-testid="likes-Website Content QA"]', {
+    timeout: 100000,
+  });
+
+  await page.getByTestId("likes-Website Content QA").isVisible();
+
+  await page.waitForTimeout(1000);
 
   const likedValue = await page
     .getByTestId("likes-Website Content QA")
@@ -60,7 +67,12 @@ test("should like and add components and flows", async ({ page }) => {
 
   await page.getByTestId("like-Website Content QA").click();
 
-  await page.waitForTimeout(5000);
+  await page.waitForSelector('[data-testid="likes-Website Content QA"]', {
+    timeout: 100000,
+  });
+
+  await page.waitForTimeout(1000);
+
   const likedValueAfter = await page
     .getByTestId("likes-Website Content QA")
     .innerText();
@@ -69,14 +81,21 @@ test("should like and add components and flows", async ({ page }) => {
     expect(false).toBe(true);
   }
 
+  await page.waitForSelector('[data-testid="downloads-Website Content QA"]', {
+    timeout: 100000,
+  });
+
   const downloadValue = await page
     .getByTestId("downloads-Website Content QA")
     .innerText();
 
+  await page.waitForTimeout(1000);
+
   await page.getByTestId("install-Website Content QA").click();
   await page.waitForTimeout(1000);
+
   await page.getByText("Flow Installed Successfully").isVisible();
-  await page.waitForTimeout(5000);
+  await page.waitForTimeout(1000);
 
   const downloadValueAfter = await page
     .getByTestId("downloads-Website Content QA")
@@ -89,12 +108,19 @@ test("should like and add components and flows", async ({ page }) => {
   await page.getByTestId("install-Basic RAG").click();
   await page.waitForTimeout(1000);
   await page.getByText("Component Installed Successfully").isVisible();
-  await page.waitForTimeout(5000);
 
   await page.getByText("My Collection").click();
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector("text=Website Content QA", { timeout: 30000 });
+
   await page.getByText("Website Content QA").first().isVisible();
 
   await page.getByText("Components").first().click();
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector("text=Basic RAG", { timeout: 30000 });
+
   await page.getByText("Basic RAG").first().isVisible();
 });
 
diff --git a/src/frontend/tests/extended/features/store-shard-3.spec.ts b/src/frontend/tests/extended/features/store-shard-3.spec.ts
index 17225759e..ba511d046 100644
--- a/src/frontend/tests/extended/features/store-shard-3.spec.ts
+++ b/src/frontend/tests/extended/features/store-shard-3.spec.ts
@@ -78,30 +78,63 @@ test("should filter by type", async ({ page }) => {
   await page.getByTestId("button-store").click();
   await page.waitForTimeout(1000);
 
+  await page.waitForSelector('[data-testid="likes-Website Content QA"]', {
+    timeout: 100000,
+  });
+
   await page.getByText("Website Content QA").isVisible();
 
+  await page.waitForSelector('[data-testid="flows-button-store"]', {
+    timeout: 100000,
+  });
+
   await page.getByTestId("flows-button-store").click();
-  await page.waitForTimeout(8000);
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector('[data-testid="icon-Group"]', {
+    timeout: 100000,
+  });
 
   let iconGroup = await page.getByTestId("icon-Group")?.count();
   expect(iconGroup).not.toBe(0);
 
   await page.getByText("icon-ToyBrick").last().isHidden();
 
+  await page.waitForSelector('[data-testid="components-button-store"]', {
+    timeout: 100000,
+  });
+
   await page.getByTestId("components-button-store").click();
-  await page.waitForTimeout(8000);
+  await page.waitForTimeout(1000);
 
   await page.getByTestId("icon-Group").last().isHidden();
+
+  await page.waitForSelector('[data-testid="icon-ToyBrick"]', {
+    timeout: 100000,
+  });
+
   let toyBrick = await page.getByTestId("icon-ToyBrick")?.count();
   expect(toyBrick).not.toBe(0);
 
+  await page.waitForSelector('[data-testid="all-button-store"]', {
+    timeout: 100000,
+  });
+
   await page.getByTestId("all-button-store").click();
-  await page.waitForTimeout(10000);
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector('[data-testid="icon-Group"]', {
+    timeout: 100000,
+  });
+
+  await page.waitForSelector('[data-testid="icon-ToyBrick"]', {
+    timeout: 100000,
+  });
 
   let iconGroupAllCount = await page.getByTestId("icon-Group")?.count();
-  await page.waitForTimeout(5000);
+  await page.waitForTimeout(500);
   let toyBrickAllCount = await page.getByTestId("icon-ToyBrick")?.count();
-  await page.waitForTimeout(5000);
+  await page.waitForTimeout(500);
 
   if (iconGroupAllCount === 0 || toyBrickAllCount === 0) {
     expect(false).toBe(true);