diff --git a/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json b/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json
index af5b14fe..2d9c7e87 100644
--- a/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json
+++ b/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json
@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "boxes_allow_inhibit"
+    "boxes_allow_inhibit",
+    "connections_allow_inhibit",
+    "vinagre_allow_inhibit"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/vnc/boxes_fullscreen-20191105.json b/needles/anaconda/vnc/boxes_fullscreen-20191105.json
index 6e7522bd..e7fd30e9 100644
--- a/needles/anaconda/vnc/boxes_fullscreen-20191105.json
+++ b/needles/anaconda/vnc/boxes_fullscreen-20191105.json
@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "boxes_fullscreen"
+    "boxes_fullscreen",
+    "connections_fullscreen"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/vnc/boxes_new_connection-20191105.json b/needles/anaconda/vnc/boxes_new_connection-20191105.json
index 4b0298e2..68cd9d90 100644
--- a/needles/anaconda/vnc/boxes_new_connection-20191105.json
+++ b/needles/anaconda/vnc/boxes_new_connection-20191105.json
@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "boxes_new_connection"
+    "boxes_new_connection",
+    "connections_new_connection"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/vnc/boxes_remote-20191105.json b/needles/anaconda/vnc/boxes_remote-20191105.json
deleted file mode 100644
index 37f2d0fc..00000000
--- a/needles/anaconda/vnc/boxes_remote-20191105.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 115,
-      "ypos": 130,
-      "width": 50,
-      "height": 15,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "boxes_remote"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/boxes_remote-20191105.png b/needles/anaconda/vnc/boxes_remote-20191105.png
deleted file mode 100644
index 4273706a..00000000
Binary files a/needles/anaconda/vnc/boxes_remote-20191105.png and /dev/null differ
diff --git a/needles/anaconda/vnc/connections_connect-20210506.json b/needles/anaconda/vnc/connections_connect-20210506.json
new file mode 100644
index 00000000..37c66858
--- /dev/null
+++ b/needles/anaconda/vnc/connections_connect-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 103,
+      "ypos": 156,
+      "width": 24,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "connections_connect"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/connections_connect-20210506.png b/needles/anaconda/vnc/connections_connect-20210506.png
new file mode 100644
index 00000000..ba18e862
Binary files /dev/null and b/needles/anaconda/vnc/connections_connect-20210506.png differ
diff --git a/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.json b/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.json
new file mode 100644
index 00000000..b154af31
--- /dev/null
+++ b/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 605,
+      "ypos": 213,
+      "width": 116,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "vinagre_enable_shortcuts"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.png b/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.png
new file mode 100644
index 00000000..19242ab7
Binary files /dev/null and b/needles/anaconda/vnc/vinagre_enable_shortcuts-20210506.png differ
diff --git a/needles/anaconda/vnc/vinagre_fullscreen-20210506.json b/needles/anaconda/vnc/vinagre_fullscreen-20210506.json
new file mode 100644
index 00000000..d599e074
--- /dev/null
+++ b/needles/anaconda/vnc/vinagre_fullscreen-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 371,
+      "ypos": 171,
+      "width": 26,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "vinagre_fullscreen"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/vinagre_fullscreen-20210506.png b/needles/anaconda/vnc/vinagre_fullscreen-20210506.png
new file mode 100644
index 00000000..e6ce6f5d
Binary files /dev/null and b/needles/anaconda/vnc/vinagre_fullscreen-20210506.png differ
diff --git a/needles/anaconda/vnc/vinagre_new_connection-20210506.json b/needles/anaconda/vnc/vinagre_new_connection-20210506.json
new file mode 100644
index 00000000..80420264
--- /dev/null
+++ b/needles/anaconda/vnc/vinagre_new_connection-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 195,
+      "ypos": 170,
+      "width": 32,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "vinagre_new_connection"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/vinagre_new_connection-20210506.png b/needles/anaconda/vnc/vinagre_new_connection-20210506.png
new file mode 100644
index 00000000..20a60ad2
Binary files /dev/null and b/needles/anaconda/vnc/vinagre_new_connection-20210506.png differ
diff --git a/needles/anaconda/vnc/vinagre_protocol-20210506.json b/needles/anaconda/vnc/vinagre_protocol-20210506.json
new file mode 100644
index 00000000..d1b65525
--- /dev/null
+++ b/needles/anaconda/vnc/vinagre_protocol-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 441,
+      "ypos": 289,
+      "width": 30,
+      "height": 12,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "vinagre_protocol"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/vinagre_protocol-20210506.png b/needles/anaconda/vnc/vinagre_protocol-20210506.png
new file mode 100644
index 00000000..154b6bfc
Binary files /dev/null and b/needles/anaconda/vnc/vinagre_protocol-20210506.png differ
diff --git a/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.json b/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.json
new file mode 100644
index 00000000..f6160361
--- /dev/null
+++ b/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 405,
+      "ypos": 383,
+      "width": 32,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "vinagre_protocol_vnc"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.png b/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.png
new file mode 100644
index 00000000..4ce50385
Binary files /dev/null and b/needles/anaconda/vnc/vinagre_protocol_vnc-20210506.png differ
diff --git a/tests/_vnc_client_connect.pm b/tests/_vnc_client_connect.pm
index 4a674b56..ec499f8c 100644
--- a/tests/_vnc_client_connect.pm
+++ b/tests/_vnc_client_connect.pm
@@ -4,17 +4,17 @@ use testapi;
 use utils;
 
 sub run {
-    menu_launch_type('boxes');
-    assert_screen ['apps_boxes_tutorial', 'boxes_new_connection'];
-    if (match_has_tag 'apps_boxes_tutorial') {
-        # Let us get rid of the Tutorial window.
-        send_key 'esc';
-    }
-    assert_and_click('boxes_new_connection');
-    assert_and_click('boxes_remote');
-    type_very_safely("vnc://172.16.2.114:5901\n");
-    assert_and_click('boxes_allow_inhibit');
-    assert_and_click('boxes_fullscreen');
+    menu_launch_type('vinagre');
+    assert_and_click('vinagre_new_connection');
+    assert_and_click('vinagre_protocol');
+    assert_and_click('vinagre_protocol_vnc');
+    send_key('tab');
+    type_very_safely("172.16.2.114:5901\n");
+    assert_and_click('vinagre_fullscreen');
+    assert_and_click('vinagre_allow_inhibit');
+    # allow for a stupid animation to happen
+    wait_still_screen 5;
+    assert_and_click('vinagre_enable_shortcuts');
 }
 
 sub test_flags {
diff --git a/tests/_vnc_client_connect_pre.pm b/tests/_vnc_client_connect_pre.pm
index f39db083..19fa5219 100644
--- a/tests/_vnc_client_connect_pre.pm
+++ b/tests/_vnc_client_connect_pre.pm
@@ -11,6 +11,9 @@ sub run {
     setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org');
     # test test: check if we can see the server
     assert_script_run "ping -c 2 172.16.2.114";
+    # FIXME https://pagure.io/fedora-workstation/issue/231 - Boxes
+    # dropped VNC functionality, no default replacement yet
+    assert_script_run "dnf -y install vinagre";
     desktop_vt;
 }