diff --git a/bridgehead b/bridgehead
index 8d8ad5d..87d6a1f 100755
--- a/bridgehead
+++ b/bridgehead
@@ -44,7 +44,7 @@ esac
 # Load variables from /etc/bridgehead and /srv/docker/bridgehead
 set -a
 source /etc/bridgehead/$PROJECT.conf || fail_and_report 1 "/etc/bridgehead/$PROJECT.conf not found"
-fetchVarsFromVaultByFile /etc/bridgehead/$PROJECT.conf || exit 1
+fetchVarsFromVaultByFile /etc/bridgehead/$PROJECT.conf || fail_and_report 1 "Unable to fetchVarsFromVaultByFile"
 [ -e ./$PROJECT/vars ] && source ./$PROJECT/vars
 set +a
 
diff --git a/lib/functions.sh b/lib/functions.sh
index e3b4940..861d9cf 100755
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -96,7 +96,7 @@ assertVarsNotEmpty() {
 }
 
 fixPermissions() {
-	chown -R bridgehead /etc/bridgehead .
+	sudo chown -R bridgehead /etc/bridgehead /srv/docker/bridgehead
 }
 
 source lib/monitoring.sh
diff --git a/lib/setup-bridgehead-units.sh b/lib/setup-bridgehead-units.sh
index a1393c2..02febfe 100755
--- a/lib/setup-bridgehead-units.sh
+++ b/lib/setup-bridgehead-units.sh
@@ -26,7 +26,8 @@ Cmnd_Alias BRIDGEHEAD${PROJECT^^} = \\
     /bin/systemctl start bridgehead@${PROJECT}.service, \\
     /bin/systemctl stop bridgehead@${PROJECT}.service, \\
     /bin/systemctl restart bridgehead@${PROJECT}.service, \\
-    /bin/systemctl restart bridgehead@*.service
+    /bin/systemctl restart bridgehead@*.service \\
+    chown -R bridgehead /etc/bridgehead /srv/docker/bridgehead
 
 bridgehead ALL= NOPASSWD: BRIDGEHEAD${PROJECT^^}
 EOF