diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
index 0d08c946e..794df7ea9 100644
--- a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
@@ -113,7 +113,7 @@ describe('Upgrade tests', () => {
         cy.getBySel('cluster-target').click();
         // As there is already an upgrade group targeting the cluster,
         // the cluster should not be available in the dropdown
-        cy.get('#vs3__listbox').should('not.contain', clusterName);
+        cy.get('#vs4__listbox').should('not.contain', clusterName);
     }));
 
     qase(37,
diff --git a/tests/cypress/latest/fixtures/custom_cloud-config_upgrade.yaml b/tests/cypress/latest/fixtures/custom_cloud-config_upgrade.yaml
index 08d3b9da0..84b67b203 100644
--- a/tests/cypress/latest/fixtures/custom_cloud-config_upgrade.yaml
+++ b/tests/cypress/latest/fixtures/custom_cloud-config_upgrade.yaml
@@ -3,9 +3,34 @@ config:
     users:
     - name: root
       passwd: r0s@pwd1
+    write_files:
+      - path: /etc/ssh/sshd_config.d/root_access.conf
+        append: true
+        content: |
+          PermitRootLogin yes
+        owner: root:root
+        permissions: 644
   elemental:
     install:
       poweroff: true
-      device: /dev/sda
       debug: true
+      device-selector:
+      - key: Name
+        operator: In
+        values:
+          - /dev/sda
+          - /dev/vda
+          - /dev/nvme0n1
+      - key: Size
+        operator: Gt
+        values:
+          - 25Gi
+      snapshotter:
+        type: btrfs
+    reset:
+      debug: true
+      enabled: true
+      reset-persistent: true
+      reset-oem: true
+      power-off: true
 machineName: my-machine
diff --git a/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml b/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml
index 3546a78e9..ed2864708 100644
--- a/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml
+++ b/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml
@@ -4,7 +4,7 @@ config:
     - name: root
       passwd: r0s@pwd1
     write_files:
-      - path: /etc/ssh/sshd_config
+      - path: /etc/ssh/sshd_config.d/root_access.conf
         append: true
         content: |
           PermitRootLogin yes