diff --git a/check-needles.py b/check-needles.py
index 510cd04d..fd719182 100755
--- a/check-needles.py
+++ b/check-needles.py
@@ -124,7 +124,7 @@ for hashname in ("jlJmL", "7XGzO", "ps61y", "OvXj~", "GqYOp", "VEFrP"):
 for info in ("home", "personal", "work"):
     testliterals.append(f"contacts_label_{info}")
 # Needles for Maps
-for location in ("vilnius", "denali", "wellington", "scarborough", "pune"):
+for location in ("vilnius", "denali", "wellington", "poysdorf", "pune"):
     testliterals.append(f"maps_select_{location}")
     testliterals.append(f"maps_found_{location}")
     testliterals.append(f"maps_info_{location}")
diff --git a/needles/gnome/apps/maps/maps_found_poysdorf-20221207.json b/needles/gnome/apps/maps/maps_found_poysdorf-20221207.json
new file mode 100644
index 00000000..b7c5cead
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_poysdorf-20221207.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 453,
+      "ypos": 335,
+      "width": 150,
+      "height": 129,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_poysdorf"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_poysdorf-20221207.png b/needles/gnome/apps/maps/maps_found_poysdorf-20221207.png
new file mode 100644
index 00000000..c154af01
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_poysdorf-20221207.png differ
diff --git a/needles/gnome/apps/maps/maps_found_scarborough-20220930.json b/needles/gnome/apps/maps/maps_found_scarborough-20220930.json
deleted file mode 100644
index e7087a7a..00000000
--- a/needles/gnome/apps/maps/maps_found_scarborough-20220930.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 377,
-      "width": 160,
-      "ypos": 397,
-      "height": 77,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_scarborough-20220930.png b/needles/gnome/apps/maps/maps_found_scarborough-20220930.png
deleted file mode 100644
index 20254263..00000000
Binary files a/needles/gnome/apps/maps/maps_found_scarborough-20220930.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_found_scarborough-20221203.json b/needles/gnome/apps/maps/maps_found_scarborough-20221203.json
deleted file mode 100644
index bdc9ad5d..00000000
--- a/needles/gnome/apps/maps/maps_found_scarborough-20221203.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 377,
-      "height": 77,
-      "width": 160,
-      "ypos": 335
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_scarborough-20221203.png b/needles/gnome/apps/maps/maps_found_scarborough-20221203.png
deleted file mode 100644
index 400c3cdd..00000000
Binary files a/needles/gnome/apps/maps/maps_found_scarborough-20221203.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_found_scarborough.json b/needles/gnome/apps/maps/maps_found_scarborough.json
deleted file mode 100644
index 6ef3e7a7..00000000
--- a/needles/gnome/apps/maps/maps_found_scarborough.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 377,
-      "ypos": 397,
-      "width": 160,
-      "height": 77,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_scarborough.png b/needles/gnome/apps/maps/maps_found_scarborough.png
deleted file mode 100644
index 1c309dcd..00000000
Binary files a/needles/gnome/apps/maps/maps_found_scarborough.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_info_scarborough.json b/needles/gnome/apps/maps/maps_info_scarborough.json
deleted file mode 100644
index c70867e7..00000000
--- a/needles/gnome/apps/maps/maps_info_scarborough.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 394,
-      "ypos": 283,
-      "width": 129,
-      "height": 56,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_info_scarborough"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_info_scarborough.png b/needles/gnome/apps/maps/maps_info_scarborough.png
deleted file mode 100644
index 8019af5e..00000000
Binary files a/needles/gnome/apps/maps/maps_info_scarborough.png and /dev/null differ
diff --git a/needles/gnome/apps/maps/maps_select_poysdorf-20221207.json b/needles/gnome/apps/maps/maps_select_poysdorf-20221207.json
new file mode 100644
index 00000000..474b63d0
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_select_poysdorf-20221207.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 291,
+      "ypos": 134,
+      "width": 80,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_select_poysdorf"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_select_poysdorf-20221207.png b/needles/gnome/apps/maps/maps_select_poysdorf-20221207.png
new file mode 100644
index 00000000..59098499
Binary files /dev/null and b/needles/gnome/apps/maps/maps_select_poysdorf-20221207.png differ
diff --git a/needles/gnome/apps/maps/maps_select_scarborough.json b/needles/gnome/apps/maps/maps_select_scarborough.json
deleted file mode 100644
index 987eac48..00000000
--- a/needles/gnome/apps/maps/maps_select_scarborough.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 263,
-      "ypos": 151,
-      "width": 119,
-      "height": 37,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_select_scarborough"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_select_scarborough.png b/needles/gnome/apps/maps/maps_select_scarborough.png
deleted file mode 100644
index cad9cdca..00000000
Binary files a/needles/gnome/apps/maps/maps_select_scarborough.png and /dev/null differ
diff --git a/tests/applications/maps/search_location.pm b/tests/applications/maps/search_location.pm
index b77fafec..a4a1dbc0 100644
--- a/tests/applications/maps/search_location.pm
+++ b/tests/applications/maps/search_location.pm
@@ -53,7 +53,7 @@ sub run {
     $softfailCounter = $softfailCounter + $result;
     $result = search("wellington");
     $softfailCounter = $softfailCounter + $result;
-    $result = search("scarborough");
+    $result = search("poysdorf");
     $softfailCounter = $softfailCounter + $result;
     $result = search("pune");
     $softfailCounter = $softfailCounter + $result;
diff --git a/tests/applications/maps/zoom.pm b/tests/applications/maps/zoom.pm
index 3fed6d7d..fe44ee71 100644
--- a/tests/applications/maps/zoom.pm
+++ b/tests/applications/maps/zoom.pm
@@ -14,7 +14,7 @@ sub run {
     foreach (my @counter = (1 .. 4)) {
         click_lastmatch();
     }
-    assert_screen("maps_map_zoomed");
+    assert_screen("maps_map_zoomed", timeout => 60);
 
 
     # Zoom out several times and check for zoomed out map.