diff --git a/make/apps/def.mk b/make/apps/def.mk
index a9c2dab..65c24a6 100644
--- a/make/apps/def.mk
+++ b/make/apps/def.mk
@@ -1,13 +1,12 @@
 APP_DIR                         ?= $(CURDIR)
 APP_DOCKER_DIR                  ?= $(DOCKER_DIR)
 APP_DOMAIN                      ?= $(patsubst %,$(APP_DOMAIN_PREFIX)%,$(DOMAIN))
-APP_DOMAIN_PREFIX               ?= $(if $(HOST_STACK),,$(addsuffix .,$(if $(APP_HOST_MULTI_ENV),$(filter-out $(ENV_DEPLOY),$(ENV))))$(if $(APP_HOST_MULTI_USER),$(USER).))
-APP_HOST                        ?= $(patsubst %,$(APP_HOST_PREFIX)%,$(APP_DOMAIN))$(if $(HOST_STACK),$(if $(HOST_LB),$(space)$(DOMAIN)))
-APP_HOST_PREFIX                 ?= $(addsuffix .,$(if $(HOST_STACK),$(HOSTNAME),$(if $(APP_HOST_MULTI_APP),$(APP_NAME))))
-APP_HOST_MULTI                  ?= false
-APP_HOST_MULTI_APP              ?= $(if $(filter true,$(APP_HOST_MULTI)),true)
-APP_HOST_MULTI_ENV              ?= $(if $(filter true,$(APP_HOST_MULTI)),true)
-APP_HOST_MULTI_USER             ?= $(if $(filter true,$(APP_HOST_MULTI)),true)
+APP_DOMAIN_PREFIX               ?= $(if $(HOST_STACK),,$(if $(filter true,$(APP_HOST_MULTI_USER)),$(USER).))
+APP_HOST                        ?= $(patsubst %,$(APP_HOST_PREFIX)%,$(if $(filter true,$(APP_HOST_MULTI_APP)),$(APP_NAME).)$(APP_DOMAIN))$(if $(HOST_STACK),$(if $(HOST_LB),$(space)$(DOMAIN)))
+APP_HOST_PREFIX                 ?= $(addsuffix .,$(if $(HOST_STACK),$(HOSTNAME),$(if $(filter true,$(APP_HOST_MULTI_ENV)),$(ENV))))
+APP_HOST_MULTI_APP              ?= true
+APP_HOST_MULTI_ENV              ?= $(if $(filter-out local master main,$(ENV)),true)
+APP_HOST_MULTI_USER             ?= false
 APP_INSTALLED                   ?= $(APPS)
 APP_PARENT                      ?= $(MONOREPO)
 APP_PARENT_DIR                  ?= $(MONOREPO_DIR)
diff --git a/stack/host/fabio.yml b/stack/host/fabio.yml
index 302ba47..b72fc36 100644
--- a/stack/host/fabio.yml
+++ b/stack/host/fabio.yml
@@ -10,7 +10,7 @@ services:
       - FABIO_VERSION=${HOST_FABIO_VERSION:-${FABIO_VERSION:-1.6.0}}
       context: ../..
       dockerfile: docker/fabio/Dockerfile
-    command: -log.level "${HOST_FABIO_LOG_LEVEL:-INFO}" -proxy.addr "${HOST_FABIO_PROXY_ADDR:-:80,:443;cs=certs}" -proxy.auth "${HOST_FABIO_PROXY_AUTH:-name=default;type=basic;file=/host/htpasswd/default.htpasswd}" -proxy.cs "${HOST_FABIO_PROXY_CS:-cs=local;type=file;cert=/host/live/localhost/fullchain.pem;key=/host/live/localhost/privkey.pem,cs=certs;type=path;cert=/host/certs}" -proxy.matcher "${HOST_FABIO_PROXY_MATCHER:-glob}" -registry.backend "${HOST_FABIO_REGISTRY_BACKEND:-consul}" -registry.consul.addr "${HOST_FABIO_REGISTRY_CONSUL_ADDR:-consul:8500}" -registry.consul.token "${HOST_CONSUL_HTTP_TOKEN:-01234567-89ab-cdef-0123-456789abcdef}"
+    command: -log.level "${HOST_FABIO_LOG_LEVEL:-INFO}" -proxy.addr "${HOST_FABIO_PROXY_ADDR:-:80,:443;cs=certs}" -proxy.auth "${HOST_FABIO_PROXY_AUTH:-name=default;type=basic;file=/host/htpasswd/default.htpasswd}" -proxy.cs "${HOST_FABIO_PROXY_CS:-cs=local;type=file;cert=/host/live/localhost/fullchain.pem;key=/host/live/localhost/privkey.pem,cs=certs;type=path;cert=/host/certs}" -proxy.matcher "${HOST_FABIO_PROXY_MATCHER:-glob}" -registry.backend "${HOST_FABIO_REGISTRY_BACKEND:-consul}" -registry.consul.addr "${HOST_FABIO_REGISTRY_CONSUL_ADDR:-consul:8500}" -registry.consul.token "${HOST_CONSUL_HTTP_TOKEN:-01234567-89ab-cdef-0123-456789abcdef}" -log.access.target stdout -log.access.format '$$remote_host - - [$$time_common] "$$request" $$response_status $$response_body_size "$$header.Referer" "$$header.User-Agent" "$$header.forwarded" $$upstream_addr $$response_time_ms $$request_url'
     container_name: ${HOST_COMPOSE_PROJECT_NAME}-fabio
     domainname: ${DOMAINNAME}
     depends_on: