diff --git a/needles/anaconda_install_destination_pony.json b/needles/anaconda_install_destination_pony.json
deleted file mode 100644
index 8c146e29..00000000
--- a/needles/anaconda_install_destination_pony.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "tags": [
-    "anaconda_install_destination_pony",
-    "ENV-DISTRI-fedora",
-    "ENV-FLAVOR-server"
-  ],
-  "area": [
-    {
-      "xpos": 97,
-      "ypos": 225,
-      "width": 32,
-      "height": 29,
-      "type": "match"
-    }
-  ]
-}
diff --git a/needles/anaconda_install_destination_pony.png b/needles/anaconda_install_destination_pony.png
deleted file mode 100644
index e61cae29..00000000
Binary files a/needles/anaconda_install_destination_pony.png and /dev/null differ
diff --git a/needles/anaconda_install_destination_pony_selected.json b/needles/anaconda_install_destination_pony_selected.json
deleted file mode 100644
index 9851ed86..00000000
--- a/needles/anaconda_install_destination_pony_selected.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "tags": [
-    "anaconda_install_destination_pony",
-    "ENV-DISTRI-fedora",
-    "ENV-FLAVOR-develop"
-  ],
-  "area": [
-    {
-      "xpos": 92,
-      "ypos": 237,
-      "width": 25,
-      "height": 26,
-      "type": "match"
-    }
-  ],
-  "properties": []
-}
diff --git a/needles/anaconda_install_destination_pony_selected.png b/needles/anaconda_install_destination_pony_selected.png
deleted file mode 100644
index 5d979cc3..00000000
Binary files a/needles/anaconda_install_destination_pony_selected.png and /dev/null differ
diff --git a/needles/anaconda_install_destination_updates.json b/needles/anaconda_install_destination_updates.json
new file mode 100644
index 00000000..8f533ea3
--- /dev/null
+++ b/needles/anaconda_install_destination_updates.json
@@ -0,0 +1,24 @@
+{
+    "area": [
+        {
+            "height": 12,
+            "type": "match",
+            "width": 32,
+            "xpos": 33,
+            "ypos": 183,
+            "match": 100
+        },
+        {
+            "height": 11,
+            "type": "match",
+            "width": 29,
+            "xpos": 122,
+            "ypos": 183,
+            "match": 100
+        }
+    ],
+    "tags": [
+        "anaconda_install_destination_updates",
+        "ENV-DISTRI-fedora"
+    ]
+}
diff --git a/needles/anaconda_install_destination_updates.png b/needles/anaconda_install_destination_updates.png
new file mode 100644
index 00000000..98403538
Binary files /dev/null and b/needles/anaconda_install_destination_updates.png differ
diff --git a/templates b/templates
index f293e236..e5ac6325 100755
--- a/templates
+++ b/templates
@@ -1104,7 +1104,7 @@
                       name => "install_scsi_updates_img",
                       settings => [
                         { key => "BOOT_UPDATES_IMG_URL", value => "1" },
-                        { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img" },
+                        { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img" },
                         { key => "HDDMODEL", value => "virtio-scsi-pci" },
                         { key => "CDMODEL", value => "scsi-cd" },
                       ],
@@ -1285,7 +1285,7 @@
                       name => "install_updates_img_local",
                       settings => [
                         { key => "NUMDISKS", value => "2" },
-                        { key => "HDD_2", value => "disk_updates_img.img" },
+                        { key => "HDD_2", value => "disk_updates_img_2.img" },
                         { key => "BOOT_UPDATES_IMG_URL", value => "1" },
                         { key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" },
                       ],
diff --git a/tests/disk_guided_empty.pm b/tests/disk_guided_empty.pm
index 4946ebac..a9ebc660 100644
--- a/tests/disk_guided_empty.pm
+++ b/tests/disk_guided_empty.pm
@@ -11,7 +11,7 @@ sub run {
     # updates.img tests work by changing the appearance of the INSTALLATION
     # DESTINATION screen, so check that if needed.
     if (get_var('BOOT_UPDATES_IMG_URL')){
-        assert_screen "anaconda_install_destination_pony", 30;
+        assert_screen "anaconda_install_destination_updates", 30;
     }
 
     assert_and_click "anaconda_spoke_done";