diff --git a/Makefile b/Makefile
index df2f87745..1ad112a60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 export DOCKER_ORG ?= cloudposse
 export DOCKER_IMAGE ?= $(DOCKER_ORG)/geodesic
 export DOCKER_BASE_TAG ?= dev
-export DOCKER_BASE_OS ?= alpine
+export DOCKER_BASE_OS ?= debian
 export DOCKER_TAG ?= $(DOCKER_BASE_TAG)-$(DOCKER_BASE_OS)
 export DOCKER_IMAGE_NAME_BASE ?= $(DOCKER_IMAGE):$(DOCKER_BASE_TAG)
 export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG)
diff --git a/rootfs/etc/profile.d/set-cluster.sh b/rootfs/etc/profile.d/set-cluster.sh
index 92d4937aa..47455453f 100755
--- a/rootfs/etc/profile.d/set-cluster.sh
+++ b/rootfs/etc/profile.d/set-cluster.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Usage:
-#   set-cluster <cluster-short-name>|off
+#  set-cluster <cluster-short-name> [role-short-name]
+#  set-cluster off
 #
 #   With <cluster-short-name> updates the kubecfg file for the cluster with that short name (e.g. "corp")
 #   and updates KUBECONFIG to point to that file.
diff --git a/rootfs/templates/wrapper b/rootfs/templates/wrapper
index 354e20032..993507dcb 100755
--- a/rootfs/templates/wrapper
+++ b/rootfs/templates/wrapper
@@ -96,7 +96,7 @@ function use() {
 				--env GEODESIC_HOST_GID="${GROUP_ID}"
 				--env GEODESIC_LOCALHOST="${GEODESIC_LOCALHOST:=/localhost.bindfs}"
 				--env GEODESIC_BINDFS_OPTIONS
-				)
+			)
 		fi
 	fi
 
@@ -117,6 +117,10 @@ function use() {
 	fi
 
 	if [[ ${GEODESIC_CUSTOMIZATION_DISABLED-false} == false ]]; then
+		if [ -n "${GEODESIC_TRACE}" ]; then
+			DOCKER_ARGS+=(--env GEODESIC_TRACE)
+		fi
+
 		if [ -n "${ENV_FILE}" ]; then
 			DOCKER_ARGS+=(--env-file ${ENV_FILE})
 		fi
@@ -178,8 +182,8 @@ function use() {
 			echo "# Mounting ${local_home} into container with workdir ${GEODESIC_HOST_CWD}"
 		fi
 		DOCKER_ARGS+=(
-		--volume="${local_home}:${GEODESIC_LOCALHOST:-/localhost}"
-		--env LOCAL_HOME="${local_home}"
+			--volume="${local_home}:${GEODESIC_LOCALHOST:-/localhost}"
+			--env LOCAL_HOME="${local_home}"
 		)
 	fi
 
@@ -193,7 +197,7 @@ function use() {
 		--env DOCKER_NAME="${DOCKER_NAME}"
 		--env DOCKER_TAG="${DOCKER_TAG}"
 		--env GEODESIC_HOST_CWD="${GEODESIC_HOST_CWD}"
-		)
+	)
 
 	trap run_exit_hooks EXIT
 	# the extra curly braces around .ID are because this file goes through go template substitution locally before being installed as a shell script