diff --git a/make/apps/def.docker.mk b/make/apps/def.docker.mk
index 5a0872c..8cc0143 100644
--- a/make/apps/def.docker.mk
+++ b/make/apps/def.docker.mk
@@ -59,7 +59,6 @@ DOCKER_REPOSITORY               ?= $(subst -,/,$(subst _,/,$(COMPOSE_PROJECT_NAM
 DOCKER_SERVICE                  ?= $(lastword $(DOCKER_SERVICES))
 DOCKER_SERVICES                 ?= $(eval IGNORE_DRYRUN := true)$(eval IGNORE_VERBOSE := true)$(shell $(call docker-compose,config --services) 2>/dev/null)$(eval IGNORE_DRYRUN := false)$(eval IGNORE_VERBOSE := false)
 DOCKER_SHELL                    ?= /bin/sh
-ENV_VARS                        += COMPOSE_PROJECT_NAME COMPOSE_SERVICE_NAME DOCKER_BUILD_TARGET DOCKER_IMAGE_TAG DOCKER_REGISTRY DOCKER_REPOSITORY DOCKER_SHELL
 MAKECMDARGS                     += docker-run docker-run-%
 
 ifeq ($(DRONE), true)
diff --git a/make/apps/def.mk b/make/apps/def.mk
index c4aa81b..ce75ae1 100644
--- a/make/apps/def.mk
+++ b/make/apps/def.mk
@@ -25,7 +25,6 @@ APP_URL                         ?= $(patsubst %,$(APP_SCHEME)://%,$(APP_URI))
 CONTEXT                         += APP APPS BRANCH DOMAIN VERSION RELEASE
 CONTEXT_DEBUG                   += APP_DIR APP_URL APP_REPOSITORY APP_UPSTREAM_REPOSITORY ENV_DEPLOY
 ENV_DEPLOY                      ?= $(patsubst origin/%,%,$(shell git rev-parse --symbolic --remotes=origin 2>/dev/null |sed '/origin\/HEAD/d'))
-ENV_VARS                        += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL CONSUL_HTTP_TOKEN $(if $(filter true,$(MOUNT_NFS)),NFS_CONFIG)
 MAKECMDARGS                     += exec exec:% exec@% run run:% run@%
 MOUNT_NFS                       ?= false
 NFS_CONFIG                      ?= addr=$(NFS_HOST),actimeo=3,intr,noacl,noatime,nocto,nodiratime,nolock,soft,rsize=32768,wsize=32768,tcp,rw,vers=3
diff --git a/make/apps/myos/def.mk b/make/apps/myos/def.mk
index ad8e82d..553165f 100644
--- a/make/apps/myos/def.mk
+++ b/make/apps/myos/def.mk
@@ -1,5 +1,4 @@
 COMPOSE_IGNORE_ORPHANS          := true
-ENV_VARS                        += COMPOSE_IGNORE_ORPHANS MYOS_TAGS_JSON
 HOME                            ?= /home/$(USER)
 MAKECMDARGS                     += ssh-run
 MYOS_TAGS_VARS                  ?= env user
diff --git a/make/apps/myos/def.setup.mk b/make/apps/myos/def.setup.mk
index cb4e966..44b111c 100644
--- a/make/apps/myos/def.setup.mk
+++ b/make/apps/myos/def.setup.mk
@@ -1,4 +1,3 @@
-ENV_VARS                        += SETUP_SYSCTL_CONFIG
 SETUP_BINFMT                    ?= false
 SETUP_BINFMT_ARCH               ?= all
 SETUP_NFSD                      ?= false
diff --git a/make/apps/myos/def.ssh.mk b/make/apps/myos/def.ssh.mk
index acd8fef..9304103 100644
--- a/make/apps/myos/def.ssh.mk
+++ b/make/apps/myos/def.ssh.mk
@@ -1,5 +1,4 @@
 DOCKER_BUILD_VARS               += $(SSH_ENV_VARS)
-ENV_VARS                        += $(SSH_ENV_VARS)
 SSH_AUTHORIZED_KEYS             ?= $(SSH_GITHUB_AUTHORIZED_KEYS)
 SSH_BASTION_HOSTNAME            ?= 
 SSH_BASTION_USERNAME            ?= $(SSH_USER)
diff --git a/make/def.docker.mk b/make/def.docker.mk
index 4de5583..6f7e541 100644
--- a/make/def.docker.mk
+++ b/make/def.docker.mk
@@ -25,7 +25,6 @@ DOCKER_SOCKET_LOCATION          ?= /var/run/docker.sock
 DOCKER_SYSTEM                   ?= $(shell docker run --rm alpine uname -s 2>/dev/null)
 DOCKER_VOLUME                   ?= $(DOCKER_SOCKET_LOCATION):/var/run/docker.sock
 DOCKER_WORKDIR                  ?= $(PWD)
-ENV_VARS                        += DOCKER_MACHINE DOCKER_NETWORK DOCKER_NETWORK_DEFAULT DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC DOCKER_SOCKET_LOCATION DOCKER_SYSTEM HOST_COMPOSE_PROJECT_NAME HOST_COMPOSE_SERVICE_NAME HOST_DOCKER_REPOSITORY HOST_DOCKER_VOLUME HOST_GID HOST_UID USER_COMPOSE_PROJECT_NAME USER_COMPOSE_SERVICE_NAME USER_DOCKER_IMAGE USER_DOCKER_NAME USER_DOCKER_REPOSITORY USER_DOCKER_VOLUME
 HOST_COMPOSE_PROJECT_NAME       ?= $(HOSTNAME)
 HOST_COMPOSE_SERVICE_NAME       ?= $(subst _,-,$(HOST_COMPOSE_PROJECT_NAME))
 HOST_DOCKER_REPOSITORY          ?= $(subst -,/,$(subst _,/,$(HOST_COMPOSE_PROJECT_NAME)))
diff --git a/make/def.mk b/make/def.mk
index 4c1e593..99afee5 100644
--- a/make/def.mk
+++ b/make/def.mk
@@ -55,7 +55,6 @@ ENV_ARGS                        ?= $(env_args)
 ENV_FILE                        ?= $(wildcard $(if $(filter-out myos,$(MYOS)),$(MONOREPO_DIR)/.env) $(CONFIG)/$(ENV)/$(APP)/.env .env)
 ENV_LIST                        ?= $(shell ls .git/refs/heads/ 2>/dev/null)
 ENV_RESET                       ?= false
-ENV_VARS                        ?= APP BRANCH DOMAIN DOMAINNAME ENV HOME HOSTNAME GID GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME GROUP MAIL MONOREPO MONOREPO_DIR TAG UID USER VERSION
 GID                             ?= $(shell id -g 2>/dev/null)
 GIDS                            ?= $(shell id -G 2>/dev/null)
 GIT_AUTHOR_EMAIL                ?= $(or $(shell git config user.email 2>/dev/null),$(USER)@$(DOMAINNAME))
@@ -323,6 +322,7 @@ define env-vars
 	$(call INFO,env-vars,$(1))
 	$(eval file             := $(wildcard $(or $(1),$(COMPOSE_FILE))))
 	$(if $(file),$(eval ENV_VARS         := $(sort $(ENV_VARS) $(shell sed 's/\$$\$$//g' $(file) | grep -oE '\$$\{?[A-Z0-9_]+' | tr -d '{}$$'))))
+	$(call debug,ENV_VARS)
 endef
 
 # function make: Call make with predefined options and variables