diff --git a/entrypoint.sh b/entrypoint.sh
index 9713106e5ecf0a47d915d06766bb6261977bf938..a9f337163c593ae8fcf62d312b0dcd95343948f2 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -28,10 +28,10 @@ test -z "${CI_REGISTRY_PASSWORD}" && should_die "CI_REGISTRY_PASSWORD is missing
 test -z "${CI_PROJECT_PATH}" && should_die "CI_PROJECT_PATH is missing"
 test -z "${CI_COMMIT_SHA}" && should_die "CI_COMMIT_SHA is missing"
 
-if test -z "${CI_APPLICATION_TAG}" && test -z "${REGISTRY_TAG_OLD}";then
+if test -z "${CI_APPLICATION_TAG}" && test -z "${REGISTRY_TAG_OLD}"; then
     should_die "Neither CI_APPLICATION_TAG nor REGISTRY_TAG_OLD was set!"
 fi
-if test -n "${CI_APPLICATION_TAG}" && test -n "${REGISTRY_TAG_OLD}";then
+if test -n "${CI_APPLICATION_TAG}" && test -n "${REGISTRY_TAG_OLD}"; then
     should_die "Both CI_APPLICATION_TAG and REGISTRY_TAG_OLD were set!"
 fi
 
@@ -40,7 +40,10 @@ test -n "${SHOULD_DIE}" && die "Wrong config!"
 ##########################################################################################################################
 
 # DEBUG
-test -z "${RETAG_DEBUG}" || set -x
+if test -n "${RETAG_DEBUG}"; then
+    env | sort -u
+    set -x
+fi
 
 # TEST
 if test -z "${CI_COMMIT_TAG}" && test -z "${REGISTRY_TAG_OLD}"; then