diff --git a/neon/needles/install_ubiquity/bionic/installer-disk-confirm-uefi.json b/neon/needles/install_ubiquity/bionic/installer-disk-confirm-uefi.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-disk-confirm-uefi.json
@@ -0,0 +1,43 @@
+{
+  "area": [
+    {
+      "height": 180,
+      "match": 95,
+      "type": "match",
+      "width": 464,
+      "xpos": 220,
+      "ypos": 147
+    },
+    {
+      "height": 27,
+      "match": 95,
+      "type": "match",
+      "width": 64,
+      "xpos": 619,
+      "ypos": 359
+    },
+    {
+      "height": 20,
+      "match": 95,
+      "type": "match",
+      "width": 195,
+      "xpos": 356,
+      "ypos": 112
+    },
+    {
+      "height": 28,
+      "match": 95,
+      "type": "match",
+      "width": 73,
+      "xpos": 525,
+      "ypos": 359
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-disk-confirm",
+    "installer-disk-confirm-uefi",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-disk-confirm-uefi.png b/neon/needles/install_ubiquity/bionic/installer-disk-confirm-uefi.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-disk.json b/neon/needles/install_ubiquity/bionic/installer-disk.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-disk.json
@@ -0,0 +1,33 @@
+{
+  "area": [
+    {
+      "height": 24,
+      "match": 95,
+      "type": "match",
+      "width": 118,
+      "xpos": 161,
+      "ypos": 255
+    },
+    {
+      "height": 178,
+      "match": 95,
+      "type": "match",
+      "width": 747,
+      "xpos": 162,
+      "ypos": 300
+    },
+    {
+      "height": 219,
+      "match": 95,
+      "type": "match",
+      "width": 759,
+      "xpos": 155,
+      "ypos": 32
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-disk",
+    "ENV-SERIES-bionic"
+  ]
+}
diff --git a/neon/needles/install_ubiquity/bionic/installer-disk.png b/neon/needles/install_ubiquity/bionic/installer-disk.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-prepare.json b/neon/needles/install_ubiquity/bionic/installer-prepare.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-prepare.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "height": 561,
+      "match": 95,
+      "type": "match",
+      "width": 914,
+      "xpos": 0,
+      "ypos": 0
+    }
+  ],
+  "properties": [
+    "workaround"
+  ],
+  "tags": [
+    "installer-prepare",
+    "ENV-NO-SECUREBOOT",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-prepare.png b/neon/needles/install_ubiquity/bionic/installer-prepare.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-restart-now.json b/neon/needles/install_ubiquity/bionic/installer-restart-now.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-restart-now.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 31,
+      "match": 95,
+      "type": "match",
+      "width": 90,
+      "xpos": 493,
+      "ypos": 289
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-restart-now",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-restart-now.png b/neon/needles/install_ubiquity/bionic/installer-restart-now.png
new file mode 120000
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-restart-now.png
@@ -0,0 +1 @@
+installer-restart.png
\ No newline at end of file
diff --git a/neon/needles/install_ubiquity/bionic/installer-restart.json b/neon/needles/install_ubiquity/bionic/installer-restart.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-restart.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 116,
+      "match": 95,
+      "type": "match",
+      "width": 502,
+      "xpos": 220,
+      "ypos": 208
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-restart",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-restart.png b/neon/needles/install_ubiquity/bionic/installer-restart.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-show-new.json b/neon/needles/install_ubiquity/bionic/installer-show-new.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-show-new.json
@@ -0,0 +1,27 @@
+{
+  "area": [
+    {
+      "height": 45,
+      "match": 95,
+      "type": "match",
+      "width": 142,
+      "xpos": 7,
+      "ypos": 262
+    },
+    {
+      "height": 468,
+      "match": 95,
+      "type": "match",
+      "width": 756,
+      "xpos": 156,
+      "ypos": 42
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-show-new",
+    "installer-show",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-show-new.png b/neon/needles/install_ubiquity/bionic/installer-show-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-timezone.json b/neon/needles/install_ubiquity/bionic/installer-timezone.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-timezone.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 0,
+      "ypos": 0,
+      "width": 914,
+      "height": 470,
+      "match": 75
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-timezone",
+    "ENV-SERIES-bionic"
+  ]
+}
diff --git a/neon/needles/install_ubiquity/bionic/installer-timezone.png b/neon/needles/install_ubiquity/bionic/installer-timezone.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-user-complete.json b/neon/needles/install_ubiquity/bionic/installer-user-complete.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-user-complete.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 278,
+      "match": 95,
+      "type": "match",
+      "width": 760,
+      "xpos": 154,
+      "ypos": 30
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-user-complete",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-user-complete.png b/neon/needles/install_ubiquity/bionic/installer-user-complete.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-user-user.json b/neon/needles/install_ubiquity/bionic/installer-user-user.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-user-user.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 274,
+      "match": 95,
+      "type": "match",
+      "width": 759,
+      "xpos": 155,
+      "ypos": 34
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-user-user",
+    "ENV-SERIES-bionic"
+  ]
+}
diff --git a/neon/needles/install_ubiquity/bionic/installer-user-user.png b/neon/needles/install_ubiquity/bionic/installer-user-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/needles/install_ubiquity/bionic/installer-user.json b/neon/needles/install_ubiquity/bionic/installer-user.json
new file mode 100644
--- /dev/null
+++ b/neon/needles/install_ubiquity/bionic/installer-user.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 397,
+      "match": 95,
+      "type": "match",
+      "width": 761,
+      "xpos": 153,
+      "ypos": 36
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "installer-user",
+    "ENV-SERIES-bionic"
+  ]
+}
+
diff --git a/neon/needles/install_ubiquity/bionic/installer-user.png b/neon/needles/install_ubiquity/bionic/installer-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/neon/tests/install_ubiquity.pm b/neon/tests/install_ubiquity.pm
--- a/neon/tests/install_ubiquity.pm
+++ b/neon/tests/install_ubiquity.pm
@@ -49,6 +49,14 @@
         assert_screen 'installer-welcome-espanol';
     }
     assert_and_click "installer-next";
+
+    # bionic version of ubiquity moved the keyboard configuration as first step
+    if (testapi::get_var('OPENQA_SERIES') eq 'bionic') {
+        assert_screen "installer-keyboard", 16;
+        record_soft_failure 'https://phabricator.kde.org/T9236';
+        assert_and_click "installer-next";
+    }
+
     assert_screen "installer-prepare", 16;
     assert_and_click "installer-next";
     assert_screen "installer-disk", 16;
@@ -64,9 +72,14 @@
     #   fairly weird when moving away from the disk page.
     assert_screen "installer-timezone", 60;
     assert_and_click "installer-next";
-    assert_screen "installer-keyboard", 16;
-    assert_and_click "installer-next";
 
+    # bionic version of ubiquity moved the keyboard configuration as first step
+    # while in xenial version the keyboard config is after timezone setup
+    if (testapi::get_var('OPENQA_SERIES') eq 'xenial') {
+        assert_screen "installer-keyboard", 16;
+        record_soft_failure 'https://phabricator.kde.org/T9236';
+        assert_and_click "installer-next";
+    }
     assert_screen "installer-user", 16;
     type_string $user;
     # user in user field, name field (needle doesn't include hostname in match)
@@ -80,7 +93,7 @@
     assert_screen "installer-user-complete", 16;
     assert_and_click "installer-next";
 
-    assert_screen "installer-show", 10;
+    assert_screen "installer-show", 15;
 
     # Let install finish and restart
     assert_screen "installer-restart", 640;