diff --git a/.zuul.yaml b/.zuul.yaml
index 3252f3ea..e7bcfc0b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 ---
+
 - project:
     templates:
       - build-openstack-docs-pti
@@ -25,6 +26,7 @@
 # This job is to begin testing a DevStack run here
 - job:
     name: stx-devstack-base
+    nodeset: openstack-single-node-xenial
     parent: devstack
     description: |
       Base job for StarlingX DevStack tests
@@ -67,6 +69,7 @@
         postgresql: true
       devstack_localrc:
         LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
+        FORCE: yes
 
 - job:
     name: stx-devstack-fault
diff --git a/devstack/lib/stx-fault b/devstack/lib/stx-fault
index 9c78ab39..dd1ee62b 100644
--- a/devstack/lib/stx-fault
+++ b/devstack/lib/stx-fault
@@ -249,7 +249,7 @@ function install_fm_common {
         INC_DIR=/include \
         MAJOR=$major \
         MINOR=$minor \
-        install_non_bb
+        install
 
     sudo python setup.py install \
         --root=/ \
@@ -291,7 +291,7 @@ function install_fm_mgr {
         INC_DIR=/include \
         MAJOR=$major \
         MINOR=$minor \
-        install_non_bb
+        install
 
     popd
 }