diff --git a/docker-compose.installer.yml b/docker-compose.installer.yml
index a9773510c..4ce557b8f 100644
--- a/docker-compose.installer.yml
+++ b/docker-compose.installer.yml
@@ -1,5 +1,3 @@
-version : '2.2'
-
 services :
   installer :
     container_name : azuracast_installer
diff --git a/docker-compose.migrate.yml b/docker-compose.migrate.yml
index 326bccfc0..83bad38c4 100644
--- a/docker-compose.migrate.yml
+++ b/docker-compose.migrate.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   web:
     volumes:
diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml
index 8ed2db901..0661c799e 100644
--- a/docker-compose.sample.yml
+++ b/docker-compose.sample.yml
@@ -9,7 +9,6 @@
 #   docker-compose.override.yml
 # with any changes you need to make.
 #
-version : '2.2'
 
 services :
   nginx_proxy :
@@ -41,7 +40,7 @@ services :
       - letsencrypt_acme:/etc/acme.sh
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment :
-      DEFAULT_EMAIL : ${LETSENCRYPT_EMAIL}
+      DEFAULT_EMAIL: ${LETSENCRYPT_EMAIL:-}
     networks :
       - frontend
     restart : unless-stopped
@@ -59,16 +58,16 @@ services :
       - redis
     env_file : azuracast.env
     environment :
-      LANG : ${LANG:-en_US.UTF-8}
-      AZURACAST_DC_REVISION : 12
-      AZURACAST_VERSION : ${AZURACAST_VERSION:-latest}
-      AZURACAST_SFTP_PORT : ${AZURACAST_SFTP_PORT:-2022}
-      VIRTUAL_HOST : ${LETSENCRYPT_HOST:-azuracast.local}
-      NGINX_TIMEOUT : ${NGINX_TIMEOUT:-1800}
-      LETSENCRYPT_HOST : ${LETSENCRYPT_HOST}
-      LETSENCRYPT_EMAIL : ${LETSENCRYPT_EMAIL}
-      PUID : ${AZURACAST_PUID:-1000}
-      PGID : ${AZURACAST_PGID:-1000}
+      LANG: ${LANG:-en_US.UTF-8}
+      AZURACAST_DC_REVISION: 12
+      AZURACAST_VERSION: ${AZURACAST_VERSION:-latest}
+      AZURACAST_SFTP_PORT: ${AZURACAST_SFTP_PORT:-2022}
+      VIRTUAL_HOST: ${LETSENCRYPT_HOST:-azuracast.local}
+      NGINX_TIMEOUT: ${NGINX_TIMEOUT:-1800}
+      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST:-}
+      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-}
+      PUID: ${AZURACAST_PUID:-1000}
+      PGID: ${AZURACAST_PGID:-1000}
     volumes :
       - letsencrypt:/etc/nginx/certs:ro
       - www_vendor:/var/azuracast/www/vendor
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
index bbe7b436a..c903b744a 100644
--- a/docker-compose.testing.yml
+++ b/docker-compose.testing.yml
@@ -1,5 +1,3 @@
-version : '2.2'
-
 services :
   web :
     build :
diff --git a/docker.sh b/docker.sh
index ea01d9684..45889a328 100755
--- a/docker.sh
+++ b/docker.sh
@@ -522,6 +522,12 @@ update() {
       rm docker.new.sh
     fi
 
+    if ! docker-compose config; then
+      if ask "Docker Compose needs to be updated to continue. Update to latest version?" Y; then
+        install-docker-compose
+      fi
+    fi
+
     run-installer --update "$@"
 
     # Check for updated Docker Compose config.