diff --git a/main.yml b/main.yml
index cc8f53f..144ced3 100644
--- a/main.yml
+++ b/main.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Add chosen node to tester group
       add_host:
-          name: "{{ install.tester.node|default(groups.tester|first) }}"
+          name: "{{ install.tester.node|default((groups.get('undercloud', {})|first))|default(groups.tester|first) }}"
           groups: "tester"
     - include_role:
           name: inventory-update
diff --git a/plugin.spec b/plugin.spec
index d1ef5ed..e8238fb 100644
--- a/plugin.spec
+++ b/plugin.spec
@@ -57,4 +57,3 @@ subparsers:
                   tester-node:
                       type: Value
                       help: The name of the node from where to run the patching
-                      default: 'undercloud-0'