diff --git a/docker/Makefile b/docker/Makefile
index 87c084010b4..7cd610964e0 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -53,11 +53,11 @@ deploy-dev:
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy.sh"
+	./deploy-scripts/zms-deploy.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
-	sh "./deploy-scripts/zts-deploy.sh"
+	./deploy-scripts/zts-deploy.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zts-debug.sh
 
 deploy-local:
@@ -65,30 +65,30 @@ deploy-local:
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy-local.sh"
+	./deploy-scripts/zms-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
-	sh "./amazon-trust.sh"
+	./amazon-trust.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
-	sh "./deploy-scripts/zts-deploy-local.sh"
+	./deploy-scripts/zts-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zts-debug.sh
 	# UI
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/ui-auto-config.sh
-	sh "./deploy-scripts/ui-deploy-local.sh"
+	./deploy-scripts/ui-deploy-local.sh
 
 prepare-ui-dev-env:
 	# generate self-signed certificates
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/self-signed-certificates.sh
 	# ZMS
 	docker run --rm -t -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zms-auto-config.sh
-	sh "./deploy-scripts/zms-deploy-local.sh"
+	./deploy-scripts/zms-deploy-local.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/deploy-scripts/zms-debug.sh
 	# ZTS
-	sh "./amazon-trust.sh"
+	./amazon-trust.sh
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/zts-auto-config.sh
 	# UI defaults
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz/athenz-setup-env sh /athenz/docker/setup-scripts/ui-auto-config.sh
-	sh "./prepare-local-ui-dev-env.sh"
+	./prepare-local-ui-dev-env.sh
 
 verify:
 	docker run --rm -t --network="$(DOCKER_NETWORK)" -v "$(BASE_DIR):/athenz" --user "$(shell id -u):$(shell id -g)" athenz-setup-env sh /athenz/docker/deploy-scripts/zms-verify.sh
diff --git a/docker/amazon-trust.sh b/docker/amazon-trust.sh
index e7501925a7e..52859ff577c 100755
--- a/docker/amazon-trust.sh
+++ b/docker/amazon-trust.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 if test -e /etc/pki/tls/certs/ca-bundle.crt; then
   BASE_DIR=$(git rev-parse --show-toplevel)
diff --git a/docker/deploy-scripts/acceptance-test-reset.sh b/docker/deploy-scripts/acceptance-test-reset.sh
old mode 100644
new mode 100755
index cc1170adcdb..015fe0df7a2
--- a/docker/deploy-scripts/acceptance-test-reset.sh
+++ b/docker/deploy-scripts/acceptance-test-reset.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/acceptance-test.sh b/docker/deploy-scripts/acceptance-test.sh
old mode 100644
new mode 100755
index daa39e78d1e..7ba10cdca1c
--- a/docker/deploy-scripts/acceptance-test.sh
+++ b/docker/deploy-scripts/acceptance-test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh b/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh
index d6f9237a96f..2fccbe6e617 100755
--- a/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh
+++ b/docker/deploy-scripts/common/wait-for-mysql/wait-for-mysql.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/docker/deploy-scripts/ui-deploy-local.sh b/docker/deploy-scripts/ui-deploy-local.sh
old mode 100644
new mode 100755
index f1e4b075a44..f81625d6db6
--- a/docker/deploy-scripts/ui-deploy-local.sh
+++ b/docker/deploy-scripts/ui-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zms-debug.sh b/docker/deploy-scripts/zms-debug.sh
old mode 100644
new mode 100755
index b74cd619171..2050745f517
--- a/docker/deploy-scripts/zms-debug.sh
+++ b/docker/deploy-scripts/zms-debug.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zms-deploy-local.sh b/docker/deploy-scripts/zms-deploy-local.sh
old mode 100644
new mode 100755
index de885f68d98..2f9653110eb
--- a/docker/deploy-scripts/zms-deploy-local.sh
+++ b/docker/deploy-scripts/zms-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zms-deploy.sh b/docker/deploy-scripts/zms-deploy.sh
old mode 100644
new mode 100755
index f5bb458eeeb..e8cbc035aec
--- a/docker/deploy-scripts/zms-deploy.sh
+++ b/docker/deploy-scripts/zms-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zms-verify.sh b/docker/deploy-scripts/zms-verify.sh
old mode 100644
new mode 100755
index 4998ad398e6..e4273b49094
--- a/docker/deploy-scripts/zms-verify.sh
+++ b/docker/deploy-scripts/zms-verify.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zts-debug.sh b/docker/deploy-scripts/zts-debug.sh
old mode 100644
new mode 100755
index aeba76b8007..509acaf4b31
--- a/docker/deploy-scripts/zts-debug.sh
+++ b/docker/deploy-scripts/zts-debug.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zts-deploy-local.sh b/docker/deploy-scripts/zts-deploy-local.sh
old mode 100644
new mode 100755
index 05d97426c11..54a5d6d44b3
--- a/docker/deploy-scripts/zts-deploy-local.sh
+++ b/docker/deploy-scripts/zts-deploy-local.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
@@ -80,7 +80,7 @@ docker exec --user mysql:mysql \
     "${ZTS_DB_HOST}" mysql \
     --database=zts_store \
     --user=root --password="${ZTS_DB_ROOT_PASS}" \
-    --execute="CREATE USER 'zts_admin'@'${ZTS_HOST}.${DOCKER_NETWORK}' IDENTIFIED BY '${ZTS_DB_ADMIN_PASS}'; GRANT ALL PRIVILEGES ON zts_store.* TO 'zts_admin'@'${ZTS_HOST}.${DOCKER_NETWORK}'; FLUSH PRIVILEGES;"
+    --execute="CREATE USER 'zts_admin'@'%' IDENTIFIED BY '${ZTS_DB_ADMIN_PASS}'; GRANT ALL PRIVILEGES ON zts_store.* TO 'zts_admin'@'%'; FLUSH PRIVILEGES;"
 docker exec --user mysql:mysql \
     "${ZTS_DB_HOST}" mysql \
     --database=mysql \
diff --git a/docker/deploy-scripts/zts-deploy.sh b/docker/deploy-scripts/zts-deploy.sh
old mode 100644
new mode 100755
index c2f8f11a7c8..9156dd9c64b
--- a/docker/deploy-scripts/zts-deploy.sh
+++ b/docker/deploy-scripts/zts-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/deploy-scripts/zts-verify.sh b/docker/deploy-scripts/zts-verify.sh
old mode 100644
new mode 100755
index e6c4374709d..f7878d7a894
--- a/docker/deploy-scripts/zts-verify.sh
+++ b/docker/deploy-scripts/zts-verify.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/docs/cast/bootstrap-demo-welcome-script.sh b/docker/docs/cast/bootstrap-demo-welcome-script.sh
old mode 100644
new mode 100755
index 4069d6edc57..bb42c684ad7
--- a/docker/docs/cast/bootstrap-demo-welcome-script.sh
+++ b/docker/docs/cast/bootstrap-demo-welcome-script.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail
diff --git a/docker/env.sh b/docker/env.sh
old mode 100644
new mode 100755
index 59d20a9bfcb..8c07aead83d
--- a/docker/env.sh
+++ b/docker/env.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail
diff --git a/docker/local-nameserver.sh b/docker/local-nameserver.sh
index 799a0636d60..19f9413233e 100755
--- a/docker/local-nameserver.sh
+++ b/docker/local-nameserver.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 nameservers=$( grep -v '^#' < /etc/resolv.conf | grep nameserver | awk '{print $2}')
 LOCAL_ENV_NS=""
diff --git a/docker/prepare-local-ui-dev-env.sh b/docker/prepare-local-ui-dev-env.sh
index 8282527a3fc..77c03aad66b 100755
--- a/docker/prepare-local-ui-dev-env.sh
+++ b/docker/prepare-local-ui-dev-env.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 BASE_DIR=$(git rev-parse --show-toplevel)
 cp ${BASE_DIR}/docker/ui/var/keys/*.pem ${BASE_DIR}/ui/keys
diff --git a/docker/sample/CAs/create-self-signed-ca.sh b/docker/sample/CAs/create-self-signed-ca.sh
index df97a17f2f4..f1a7441aa22 100755
--- a/docker/sample/CAs/create-self-signed-ca.sh
+++ b/docker/sample/CAs/create-self-signed-ca.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/sample/domain-admin/create-self-signed-user-cert.sh b/docker/sample/domain-admin/create-self-signed-user-cert.sh
index d103dd25b79..694726bed2b 100755
--- a/docker/sample/domain-admin/create-self-signed-user-cert.sh
+++ b/docker/sample/domain-admin/create-self-signed-user-cert.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/sample/env.dev.sh b/docker/sample/env.dev.sh
old mode 100644
new mode 100755
index 636c0152c18..e83da49c7e1
--- a/docker/sample/env.dev.sh
+++ b/docker/sample/env.dev.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail
diff --git a/docker/sample/ui/create-self-signed-certs.sh b/docker/sample/ui/create-self-signed-certs.sh
index cfcee265b2d..e083427f29e 100755
--- a/docker/sample/ui/create-self-signed-certs.sh
+++ b/docker/sample/ui/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/sample/zms/create-self-signed-certs.sh b/docker/sample/zms/create-self-signed-certs.sh
index 5eac0fb036f..99d8b7cf578 100755
--- a/docker/sample/zms/create-self-signed-certs.sh
+++ b/docker/sample/zms/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/sample/zts/create-self-signed-certs.sh b/docker/sample/zts/create-self-signed-certs.sh
index 900841d91a5..4ead3647afb 100755
--- a/docker/sample/zts/create-self-signed-certs.sh
+++ b/docker/sample/zts/create-self-signed-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/setup-scripts/common/color-print.sh b/docker/setup-scripts/common/color-print.sh
old mode 100644
new mode 100755
index 29e9d5f27aa..53326b4c3cc
--- a/docker/setup-scripts/common/color-print.sh
+++ b/docker/setup-scripts/common/color-print.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -u
 set -o pipefail
diff --git a/docker/setup-scripts/sample-identity.sh b/docker/setup-scripts/sample-identity.sh
index 98db7fc4c22..a014d37e9d7 100755
--- a/docker/setup-scripts/sample-identity.sh
+++ b/docker/setup-scripts/sample-identity.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # to setup-scripts directory
 cd "$(dirname "$0")"
diff --git a/docker/setup-scripts/self-signed-certificates.sh b/docker/setup-scripts/self-signed-certificates.sh
index 6c5e0d37d4e..d8ed21cda61 100755
--- a/docker/setup-scripts/self-signed-certificates.sh
+++ b/docker/setup-scripts/self-signed-certificates.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/setup-scripts/ui-auto-config.sh b/docker/setup-scripts/ui-auto-config.sh
index 321a3423210..84a2c52f31e 100755
--- a/docker/setup-scripts/ui-auto-config.sh
+++ b/docker/setup-scripts/ui-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/setup-scripts/zms-auto-config.sh b/docker/setup-scripts/zms-auto-config.sh
index d24cc8ff1af..e488a4cffdc 100755
--- a/docker/setup-scripts/zms-auto-config.sh
+++ b/docker/setup-scripts/zms-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/setup-scripts/zts-auto-config.sh b/docker/setup-scripts/zts-auto-config.sh
index fa4280a3b1d..767d383ae8c 100755
--- a/docker/setup-scripts/zts-auto-config.sh
+++ b/docker/setup-scripts/zts-auto-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index ab093cf19e1..56c6a3b4a0d 100644
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.2-alpine AS builder
+FROM node:fermium-alpine AS builder
 
 RUN set -eux && apk update && apk add --no-cache --update ca-certificates libstdc++ libgcc tini make git
 
@@ -26,7 +26,7 @@ RUN rm -rf scripts \
     && rm -rf pom.xml \
     && rm -rf README.md
 
-FROM node:12.16.2-alpine
+FROM node:fermium-alpine
 # date -u +'%Y-%m-%dT%H:%M:%SZ'
 ARG BUILD_DATE
 # git rev-parse --short HEAD
@@ -43,9 +43,10 @@ LABEL org.label-schema.vcs-ref=$VCS_REF
 ARG GID=1001
 ARG UID=10001
 
+RUN mkdir -p /var/lib/sia/tokens/msd-api-access && touch /var/lib/sia/tokens/msd-api-access/msd-api-access-token
 # add athenz user
 RUN addgroup -g ${GID} athenz && \
-  adduser -S -D -H -s /sbin/nologin -u ${UID} -G athenz athenz
+  adduser -S -D -H -s /sbin/nologin -u ${UID} -G athenz athenz && chown -R athenz:athenz /var/lib/sia/tokens/msd-api-access
 USER athenz
 
 WORKDIR /opt/athenz/ui
diff --git a/docker/zms/docker-entrypoint.sh b/docker/zms/docker-entrypoint.sh
index 73bc2c3080f..6e7557fd360 100755
--- a/docker/zms/docker-entrypoint.sh
+++ b/docker/zms/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ZMS_STOP_TIMEOUT=${ZMS_STOP_TIMEOUT:-30}
 ZMS_CLASSPATH="${CLASSPATH}:${USER_CLASSPATH}"
@@ -12,7 +12,6 @@ JAVA_OPTS="${JAVA_OPTS} -Dathenz.zms.jdbc_password=${ZMS_DB_ADMIN_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.zms.jdbc_ro_password=${ZMS_RODB_ADMIN_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.ssl_key_store_password=${ZMS_KEYSTORE_PASS}"
 JAVA_OPTS="${JAVA_OPTS} -Dathenz.ssl_trust_store_password=${ZMS_TRUSTSTORE_PASS}"
-JAVA_OPTS="${JAVA_OPTS} -Djava.io.tmpdir=/tmp"
 
 ### !!! P.S. cannot quote JAVA_OPTS !!!
 ### reference: https://github.com/koalaman/shellcheck/wiki/SC2086
diff --git a/docker/zts/conf/athenz.properties b/docker/zts/conf/athenz.properties
index f1bb5283e69..de4a61a7b67 100644
--- a/docker/zts/conf/athenz.properties
+++ b/docker/zts/conf/athenz.properties
@@ -126,3 +126,6 @@ athenz.graceful_shutdown=true
 # How long to wait for the Jetty server to shutdown, in milliseconds
 # If the athenz.graceful_shutdown is not true, this setting is invalid.
 athenz.graceful_shutdown_timeout=30000
+
+# Need this to start root-less container
+athenz.jetty_temp=/tmp
\ No newline at end of file
diff --git a/docker/zts/docker-entrypoint.sh b/docker/zts/docker-entrypoint.sh
index 0968050bec5..c27013e72d7 100755
--- a/docker/zts/docker-entrypoint.sh
+++ b/docker/zts/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ZTS_STOP_TIMEOUT=${ZTS_STOP_TIMEOUT:-30}
 ZTS_CLASSPATH="${CLASSPATH}:${USER_CLASSPATH}"
diff --git a/docs/local_ui_development.md b/docs/local_ui_development.md
index 64fd8830c04..bc7d1e5ff54 100644
--- a/docs/local_ui_development.md
+++ b/docs/local_ui_development.md
@@ -3,7 +3,7 @@ In this guide, you will be able to start a local ZMS server and do local ui deve
 
 ## Prerequisites
 
-Docker, Make toolchain, Node v12.14.0, nodemon v2.0.3
+Docker, Make toolchain, Node v14.x, nodemon v2.x
 
 ## Steps
 
diff --git a/servers/zms/scripts/setup_dev_zms.sh b/servers/zms/scripts/setup_dev_zms.sh
index d1e1ab179f1..03381e79352 100755
--- a/servers/zms/scripts/setup_dev_zms.sh
+++ b/servers/zms/scripts/setup_dev_zms.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 
diff --git a/servers/zts/scripts/setup_dev_zts.sh b/servers/zts/scripts/setup_dev_zts.sh
index 872f3363c08..6e001966cf3 100755
--- a/servers/zts/scripts/setup_dev_zts.sh
+++ b/servers/zts/scripts/setup_dev_zts.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 
diff --git a/start-local-athenz.sh b/start-local-athenz.sh
index 95a91b65af5..6cfe1177487 100755
--- a/start-local-athenz.sh
+++ b/start-local-athenz.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/stop-local-athenz.sh b/stop-local-athenz.sh
index 11e6ff8211e..d42fffb77b0 100755
--- a/stop-local-athenz.sh
+++ b/stop-local-athenz.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
diff --git a/ui/scripts/setup_dev_ui.sh b/ui/scripts/setup_dev_ui.sh
index 5fbac76a755..e502d6df216 100755
--- a/ui/scripts/setup_dev_ui.sh
+++ b/ui/scripts/setup_dev_ui.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Determine our run-time directory
 
@@ -69,4 +69,8 @@ elif [ "$HOST_PLATFORM" == 'darwin' ] ; then
   cat /dev/urandom | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 16 > "$ROOT"/keys/cookie-session
 fi
 
+echo "Creating a dummy token file"
+sudo mkdir -p /var/lib/sia/tokens/msd-api-access/ && sudo chown -R "$(id -u)":"$(id -g)" /var/lib/sia/tokens/msd-api-access
+touch /var/lib/sia/tokens/msd-api-access/msd-api-access-token
+
 echo "Athenz UI Dev Environment setup complete"