diff --git a/.zuul.yaml b/.zuul.yaml
index 3b4f4bac..594f96a4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,8 +11,7 @@
         - openstack-tox-py27
         - openstack-tox-py35
         - stx-updates-pylint
-        - stx-devstack-update:
-            voting: false
+        - stx-devstack-update
     gate:
       jobs:
         - build-openstack-api-ref
diff --git a/devstack/lib/stx-update b/devstack/lib/stx-update
index 7a17098a..2088f7c2 100644
--- a/devstack/lib/stx-update
+++ b/devstack/lib/stx-update
@@ -25,8 +25,14 @@ STX_PATCH_DIR=$STXUPDATE_DIR/cgcs-patch/
 TSCONFIG_DIR=$STXUPDATE_DIR/tsconfig/
 
 # STX_INST_DIR should be a non-root-writable place to install build artifacts
-STX_INST_DIR=${STX_INST_DIR:-$DEST/usr}
-STX_BIN_DIR=$STX_INST_DIR/bin
+STX_INST_DIR=${STX_INST_DIR:-/usr/local}
+STX_BIN_DIR=${STX_BIN_DIR:-$STX_INST_DIR/bin}
+STX_SBIN_DIR=${STX_SBIN_DIR:-$STX_INST_DIR/sbin}
+
+# Set up so we don't use sudo for installs when not necessary
+STX_SUDO="sudo"
+[[ -w $STX_INST_DIR ]] && STX_SUDO="env"
+
 PYTHON_SITE_DIR=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 
 function install_sw_patch {
@@ -39,17 +45,17 @@ function install_sw_patch {
         --single-version-externally-managed
     popd
 
-    local stx_patch_sbindir=$STX_INST_DIR/sbin
+    local stx_patch_sbindir=$STX_SBIN_DIR
     local stx_patch_sysconfdir=/etc/
-    sudo install -m 755 -d ${stx_patch_sbindir}
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/bash_completion.d
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/goenabled.d
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/init.d
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/logrotate.d
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/patching
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/patching/patch-scripts
-    sudo install -m 755 -d ${stx_patch_sysconfdir}/pmon.d
-    sudo install -m 500 $STX_PATCH_DIR/bin/sw-patch-agent ${stx_patch_sbindir}/sw-patch-agent
+    $STX_SUDO install -m 755 -d ${stx_patch_sbindir}
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/bash_completion.d
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/goenabled.d
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/init.d
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/logrotate.d
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/patching
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/patching/patch-scripts
+    $STX_SUDO install -m 755 -d ${stx_patch_sysconfdir}/pmon.d
+    $STX_SUDO install -m 500 $STX_PATCH_DIR/bin/sw-patch-agent ${stx_patch_sbindir}/sw-patch-agent
 }
 
 function install_tsconfig {
@@ -63,8 +69,8 @@ function install_tsconfig {
         --install-data=/usr/share \
         --single-version-externally-managed
     popd
-    sudo install -d -m 755 $STX_BIN_DIR
-    sudo install -p -D -m 700 $TSCONFIG_DIR/scripts/tsconfig $STX_BIN_DIR/tsconfig
+    $STX_SUDO install -d -m 755 $STX_BIN_DIR
+    $STX_SUDO install -p -D -m 700 $TSCONFIG_DIR/scripts/tsconfig $STX_BIN_DIR/tsconfig
 }
 
 function install_update {