diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png
index 59ef03ed8..9b11f0227 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-linux.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-linux.png
index 12808ebb9..b8e8e7b8f 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-linux.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-1-chromium-pro-linux.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png
index d34077f1c..14438b52b 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png
index 9681d66cf..2ccea401a 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Kontur-Atlas-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png
index 43b908292..f15d66819 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-darwin.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-linux.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-linux.png
index e7d163b37..a35c6e759 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-linux.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-1-chromium-pro-linux.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png
index 04a575e10..19514b358 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-darwin.png differ
diff --git a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png
index a4c363690..c7a27339d 100644
Binary files a/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png and b/e2e/locationWithPro.spec.ts-snapshots/As-PRO-User-I-can-click-Locate-me-button-at-Smart-City-and-get-zoomed-to-my-location-prod-1-chromium-pro-linux.png differ
diff --git a/e2e/login.spec.ts b/e2e/login.spec.ts
index 3d6b5743f..6f2f81fa6 100644
--- a/e2e/login.spec.ts
+++ b/e2e/login.spec.ts
@@ -3,6 +3,9 @@ import { getProjects } from './page-objects/helperBase.ts';
 
 const projects = getProjects();
 
+const linkToSurveyProd =
+  'https://docs.google.com/forms/d/e/1FAIpQLSe86tGwmJcIvs8aTc1-zyw6ihmXqIeObpeJZmd6y_fMGL70iA/viewform';
+
 // Create a loop to loop over all the projects and create a test for everyone
 for (const project of projects) {
   test(`As Guest, I can log in to ${project.title}, check that this profile is mine, and log out`, async ({
@@ -24,12 +27,12 @@ for (const project of projects) {
       await pageManager.atPricingPage.clickBtnAndAssertUrl({
         context,
         buttonName: 'Request trial',
-        expectedUrlPart: 'demo-call',
+        expectedUrlPart: project.env === 'test' ? 'demo-call' : linkToSurveyProd,
       });
       await pageManager.atPricingPage.clickBtnAndAssertUrl({
         context,
         buttonName: 'Book a demo',
-        expectedUrlPart: 'atlas-demo',
+        expectedUrlPart: project.env === 'test' ? 'atlas-demo' : linkToSurveyProd,
       });
       await pageManager.atNavigationMenu.clickButtonToOpenPage('Profile');
     }
diff --git a/e2e/page-objects/helperBase.ts b/e2e/page-objects/helperBase.ts
index c2c4bfb0b..e678df154 100644
--- a/e2e/page-objects/helperBase.ts
+++ b/e2e/page-objects/helperBase.ts
@@ -20,11 +20,8 @@ export type Project = {
 };
 
 export class HelperBase {
-  readonly page: Page;
+  constructor(public readonly page: Page) {}
 
-  constructor(page: Page) {
-    this.page = page;
-  }
   /**
    * This method opens up a project like disaster-ninja, atlas, etc. After that it checks the title to correspond to this project and accepts cookies if needed
    * @param project object with details about project to open like name, url, title, etc.
diff --git a/e2e/page-objects/mcdaPopup.ts b/e2e/page-objects/mcdaPopup.ts
index b2178091a..c057c2afb 100644
--- a/e2e/page-objects/mcdaPopup.ts
+++ b/e2e/page-objects/mcdaPopup.ts
@@ -83,7 +83,7 @@ export class MCDAPopup extends HelperBase {
     for (let i = 0; i < inputs.length; i++) {
       // We should better get a new locator for each iteration
       const layerInput = mcdaPopup.getByPlaceholder('Select layers');
-      await layerInput.pressSequentially(inputs[i], { delay: 50 });
+      await layerInput.pressSequentially(inputs[i], { delay: 90 });
       // Wait for the list of layers to be visible
       const listbox = mcdaPopup.getByRole('listbox');
       await listbox.waitFor({ state: 'visible' });
@@ -113,7 +113,7 @@ export class MCDAPopup extends HelperBase {
       saveButton,
       'Check that after inputs save button is not disabled',
     ).not.toHaveAttribute('disabled');
-    await saveButton.click({ delay: 100 });
+    await saveButton.click({ delay: 100, position: { x: 15, y: 15 } });
     // Wait for the popup to close
     await mcdaPopup.waitFor({ state: 'hidden' });
   }
diff --git a/e2e/page-objects/pricingPage.ts b/e2e/page-objects/pricingPage.ts
index 14cae0ff8..62ab742cd 100644
--- a/e2e/page-objects/pricingPage.ts
+++ b/e2e/page-objects/pricingPage.ts
@@ -15,7 +15,7 @@ export class PricingPage extends HelperBase {
       expect(this.page.getByText('Educational', { exact: true })).toBeVisible(),
       expect(this.page.getByText('Custom', { exact: true })).toBeVisible(),
       expect(this.page.getByText('Contact sales', { exact: true })).toBeVisible(),
-      plansAndPricingTexts.forEach((text) => expect(text).toBeVisible()),
+      plansAndPricingTexts.forEach((textEl) => expect(textEl).toBeVisible()),
       expect(this.page.getByText('Save 5%', { exact: true })).toBeVisible(),
     ]);
   }