diff --git a/Makefile b/Makefile
index 5a6f0b43..ce21ce4b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export SHELLOPTS:=$(if $(SHELLOPTS),$(SHELLOPTS):)pipefail:errexit
 
 .ONESHELL:
 
-GEN_PASSWORD=$(shell (/bin/bash -c 'tr -dc "a-zA-Z0-9" </dev/urandom | head -c 32 ; echo '';'))
+GEN_PASSWORD=$(shell (apg -n1 -m32))
 IMAGE_TAG = garm-build
 
 USER_ID=$(shell ((docker --version | grep -q podman) && echo "0" || id -u))
@@ -19,7 +19,6 @@ export ORG_WEBHOOK_SECRET = ${GEN_PASSWORD}
 export CREDENTIALS_NAME ?= test-garm-creds
 export WORKFLOW_FILE_NAME ?= test.yml
 export GARM_ADMIN_USERNAME ?= admin
-export RUN_USER ?= $(shell whoami)
 
 .PHONY: help
 help: ## Display this help.
diff --git a/test/integration/scripts/setup-garm.sh b/test/integration/scripts/setup-garm.sh
index a4d5dd37..6de7926d 100755
--- a/test/integration/scripts/setup-garm.sh
+++ b/test/integration/scripts/setup-garm.sh
@@ -6,11 +6,11 @@ BINARIES_DIR="$PWD/bin"
 CONTRIB_DIR="$PWD/contrib"
 CONFIG_DIR="$PWD/test/integration/config"
 CONFIG_DIR_PROV="$PWD/test/integration/provider"
-GARM_CONFIG_DIR=${GARM_CONFIG_DIR:-"/etc/garm"}
+GARM_CONFIG_DIR=${GARM_CONFIG_DIR:-$(mktemp -d)}
 PROVIDER_BIN_DIR="$GARM_CONFIG_DIR/providers.d/lxd"
 IS_GH_WORKFLOW=${IS_GH_WORKFLOW:-"true"}
 export LXD_PROVIDER_LOCATION=${LXD_PROVIDER_LOCATION:-""}
-export RUN_USER=${RUN_USER:-"garm"}
+export RUN_USER=${RUN_USER:-$(whoami)}
 export GARM_PORT=${GARM_PORT:-"9997"}
 export GARM_SERVICE_NAME=${GARM_SERVICE_NAME:-"garm"}
 export GARM_CONFIG_FILE=${GARM_CONFIG_FILE:-"${GARM_CONFIG_DIR}/config.toml"}