diff --git a/x-pack/test/functional/apps/maps/group1/sample_data.js b/x-pack/test/functional/apps/maps/group1/sample_data.js
index 62df1d3859a45..a8ebc8ec6ba85 100644
--- a/x-pack/test/functional/apps/maps/group1/sample_data.js
+++ b/x-pack/test/functional/apps/maps/group1/sample_data.js
@@ -29,61 +29,16 @@ export default function ({ getPageObjects, getService, updateBaselines }) {
       await PageObjects.home.addSampleDataSet('ecommerce');
       await PageObjects.home.addSampleDataSet('flights');
       await PageObjects.home.addSampleDataSet('logs');
+
+      // Sample data is shifted to be relative to current time
+      // This means that a static timerange will return different documents
+      // Setting the time range to a window larger than the sample data set
+      // ensures all documents are coverered by time query so the ES results will always be the same
       const SAMPLE_DATA_RANGE = `[
         {
-          "from": "now-30d",
-          "to": "now+40d",
+          "from": "now-180d",
+          "to": "now+180d",
           "display": "sample data range"
-        },
-        {
-          "from": "now/d",
-          "to": "now/d",
-          "display": "Today"
-        },
-        {
-          "from": "now/w",
-          "to": "now/w",
-          "display": "This week"
-        },
-        {
-          "from": "now-15m",
-          "to": "now",
-          "display": "Last 15 minutes"
-        },
-        {
-          "from": "now-30m",
-          "to": "now",
-          "display": "Last 30 minutes"
-        },
-        {
-          "from": "now-1h",
-          "to": "now",
-          "display": "Last 1 hour"
-        },
-        {
-          "from": "now-24h",
-          "to": "now",
-          "display": "Last 24 hours"
-        },
-        {
-          "from": "now-7d",
-          "to": "now",
-          "display": "Last 7 days"
-        },
-        {
-          "from": "now-30d",
-          "to": "now",
-          "display": "Last 30 days"
-        },
-        {
-          "from": "now-90d",
-          "to": "now",
-          "display": "Last 90 days"
-        },
-        {
-          "from": "now-1y",
-          "to": "now",
-          "display": "Last 1 year"
         }
       ]`;
 
diff --git a/x-pack/test/functional/screenshots/baseline/ecommerce_map.png b/x-pack/test/functional/screenshots/baseline/ecommerce_map.png
index df13f7d563bfe..76761be5a91bc 100644
Binary files a/x-pack/test/functional/screenshots/baseline/ecommerce_map.png and b/x-pack/test/functional/screenshots/baseline/ecommerce_map.png differ
diff --git a/x-pack/test/functional/screenshots/baseline/flights_map.png b/x-pack/test/functional/screenshots/baseline/flights_map.png
index 320a0940e2461..dd4f9f4809504 100644
Binary files a/x-pack/test/functional/screenshots/baseline/flights_map.png and b/x-pack/test/functional/screenshots/baseline/flights_map.png differ
diff --git a/x-pack/test/functional/screenshots/baseline/web_logs_map.png b/x-pack/test/functional/screenshots/baseline/web_logs_map.png
index 6cd145da94a67..c2cfaaf847030 100644
Binary files a/x-pack/test/functional/screenshots/baseline/web_logs_map.png and b/x-pack/test/functional/screenshots/baseline/web_logs_map.png differ