diff --git a/.env.docker b/.env.docker
index 1158cace4..2b1ab66a6 100644
--- a/.env.docker
+++ b/.env.docker
@@ -1,12 +1,16 @@
 #!/bin/bash
 # -*- mode: bash -*-
 # vi: ft=bash
+# shellcheck disable=SC2034,SC2148
 
 # Use Dottie (https://github.com/jippi/dottie) to manage this .env file easier!
 #
-# @dottie/source .env.docker
+# For example:
 #
-# shellcheck disable=SC2034,SC2148
+#   Run [dottie update] to update your [.env] file with upstream (as part of upgrade)
+#   Run [dottie validate] to validate youe [.env] file
+#
+# @dottie/source .env.docker
 
 ################################################################################
 # app
diff --git a/.gitignore b/.gitignore
index 689c2e13a..f83ec13c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .bashrc
 .DS_Store
 .env
+.env.dottie-backup
 .git-credentials
 .gitconfig
 /.composer/
diff --git a/Dockerfile b/Dockerfile
index efbe70510..5b6f45426 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ ARG FOREGO_VERSION="0.17.2"
 ARG GOMPLATE_VERSION="v3.11.6"
 
 # See: https://github.com/jippi/dottie
-ARG DOTTIE_VERSION="v0.6.9"
+ARG DOTTIE_VERSION="v0.7.0"
 
 ###
 # PHP base configuration