diff --git a/scripts/bitwarden.ps1 b/scripts/bitwarden.ps1
index 24dfd7001..476db122a 100644
--- a/scripts/bitwarden.ps1
+++ b/scripts/bitwarden.ps1
@@ -27,6 +27,9 @@ https://bitwarden.com, https://github.com/bitwarden
 ===================================================
 "
 
+docker --version
+docker-compose --version
+
 # Setup
 
 $scriptPath = $MyInvocation.MyCommand.Path
@@ -95,6 +98,7 @@ elseif($update) {
 
     Download-All-Files
     Invoke-Expression "$scriptsDir\run.ps1 -restart -outputDir $output -dockerDir $dockerDir"
+    Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -dockerDir $dockerDir"
 }
 elseif($updatedb) {
     Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -dockerDir $dockerDir"
diff --git a/scripts/bitwarden.sh b/scripts/bitwarden.sh
index 443e2ef3a..31c201b12 100755
--- a/scripts/bitwarden.sh
+++ b/scripts/bitwarden.sh
@@ -19,6 +19,9 @@ https://bitwarden.com, https://github.com/bitwarden
 
 EOF
 
+docker --version
+docker-compose --version
+
 # Setup
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -104,6 +107,7 @@ then
     mkdir $DOCKER_DIR
     downloadAllFiles
     $SCRIPTS_DIR/run.sh restart $OUTPUT $DOCKER_DIR
+    $SCRIPTS_DIR/run.sh updatedb $OUTPUT $DOCKER_DIR
 elif [ "$1" == "updatedb" ]
 then
     $SCRIPTS_DIR/run.sh updatedb $OUTPUT $DOCKER_DIR
diff --git a/scripts/install.ps1 b/scripts/install.ps1
index fc782459e..8aa562181 100644
--- a/scripts/install.ps1
+++ b/scripts/install.ps1
@@ -6,7 +6,6 @@ if(!(Test-Path -Path $outputDir )){
     New-Item -ItemType directory -Path $outputDir | Out-Null
 }
 
-docker --version
 echo ""
 
 [string]$letsEncrypt = "n"
diff --git a/scripts/install.sh b/scripts/install.sh
index ce974c973..8625eaeed 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-docker --version
 echo ""
 
 OUTPUT_DIR="../."
diff --git a/scripts/run.ps1 b/scripts/run.ps1
index b6c090d9f..1e4ba44c4 100644
--- a/scripts/run.ps1
+++ b/scripts/run.ps1
@@ -29,7 +29,7 @@ function Docker-Prune {
 }
 
 function Update-Lets-Encrypt {
-    if(Test-Path -Path "${outputDir}/letsencrypt") {
+    if(Test-Path -Path "${outputDir}\letsencrypt\live") {
         docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
             renew --logs-dir /etc/letsencrypt/logs
     }
diff --git a/scripts/run.sh b/scripts/run.sh
index b0fb823ee..8cb3e46b8 100644
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -38,7 +38,7 @@ function dockerPrune() {
 }
 
 function updateLetsEncrypt() {
-    if [ -d "${outputDir}/letsencrypt" ]
+    if [ -d "${outputDir}/letsencrypt/live" ]
     then
         docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \
             renew --logs-dir /etc/letsencrypt/logs