diff --git a/make/apps/def.mk b/make/apps/def.mk
index 7c56a37..03fb71d 100644
--- a/make/apps/def.mk
+++ b/make/apps/def.mk
@@ -25,7 +25,7 @@ APP_URL                         ?= $(patsubst %,$(APP_SCHEME)://%,$(APP_URI))
 APP_VERSION                     ?= $(VERSION)
 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 |sed '/origin\/HEAD/d' 2>/dev/null))
+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
diff --git a/stack/drone/drone.yml b/stack/drone/drone.yml
index 9d2884e..12efd7f 100644
--- a/stack/drone/drone.yml
+++ b/stack/drone/drone.yml
@@ -7,9 +7,12 @@ services:
     - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID:-}
     - DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET:-}
     - DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER:-}
-    - DRONE_GITHUB_SERVER=${DRONE_GITHUB_SERVER:-https://github.com}
     - DRONE_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID:-}
     - DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET:-}
+    - DRONE_GITHUB_SERVER=${DRONE_GITHUB_SERVER:-https://github.com}
+    - DRONE_GITLAB_CLIENT_ID=${DRONE_GITLAB_CLIENT_ID:-}
+    - DRONE_GITLAB_CLIENT_SECRET=${DRONE_GITLAB_CLIENT_SECRET:-}
+    - DRONE_GITLAB_SERVER=${DRONE_GITLAB_SERVER:-https://gitlab.com}
     - DRONE_LOGS_COLOR=${DRONE_LOGS_COLOR:-true}
     - DRONE_LOGS_PRETTY=${DRONE_LOGS_PRETTY:-true}
     - DRONE_PROMETHEUS_ANONYMOUS_ACCESS=${DRONE_PROMETHEUS_ANONYMOUS_ACCESS:-true}
@@ -17,8 +20,8 @@ services:
     - DRONE_SERVER_HOST=${DRONE_SERVER_HOST:-drone}
     - DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO:-http}
     - DRONE_TLS_AUTOCERT=${DRONE_TLS_AUTOCERT:-true}
-    - DRONE_USER_CREATE=${DRONE_USER_CREATE:-}
-    - DRONE_USER_FILTER=${DRONE_USER_FILTER:-}
+    - DRONE_USER_CREATE=${DRONE_USER_CREATE}
+    - DRONE_USER_FILTER=${DRONE_USER_FILTER}
     labels:
     - SERVICE_80_CHECK_TCP=true
     - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-drone-80