diff --git a/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-one-click b/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome
similarity index 100%
rename from util/DigitalOceanMarketplace/files/etc/update-motd.d/99-one-click
rename to util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome
diff --git a/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh b/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
index a35831e1f..71a30a839 100644
--- a/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
+++ b/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
@@ -11,7 +11,7 @@
 
 echo -e 'Waiting for Bitwarden database container to come online...'
 
-sleep 60s
+sleep 30s
 
 /root/bitwarden.sh updatedb
 
diff --git a/util/DigitalOceanMarketplace/scripts/03-setup-first-run b/util/DigitalOceanMarketplace/scripts/03-setup-first-run
index a1471cde4..26e4dac15 100644
--- a/util/DigitalOceanMarketplace/scripts/03-setup-first-run
+++ b/util/DigitalOceanMarketplace/scripts/03-setup-first-run
@@ -7,6 +7,14 @@
 # if you use the build_image task.
 #
 
+#
+# Make MOTD and boot script executable
+#
+
+chmod +x /var/lib/cloud/scripts/per-instance/001_onboot
+
+chmod +x /etc/update-motd.d/99-bitwarden-welcome
+
 #
 # Setup First Run Script
 # ref: https://github.com/digitalocean/marketplace-partners/blob/master/marketplace_docs/build-an-image-fabric.md#running-commands-on-first-login