diff --git a/Makefile b/Makefile
index 212d55d13..548c229a5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,13 +49,14 @@ i18n-check:
 
 .PHONY: database
 database: .develop.env .stack-work.lock # --stack-work-build
-	# $(MAKE) -- --database
-	( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
+	$(MAKE) -- --database
+	# ( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
 
 .PHONY: --database
---database: .develop.env
+--database: .stack-work.lock .develop.env
 	stack build --fast --flag uniworx:-library-only --flag uniworx:dev
 	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true}
+	export AVSPASS=$${AVSPASS:-nopasswordset}
 	stack exec uniworxdb -- $(db)
 
 .PHONY: frontend-%
@@ -99,6 +100,10 @@ clean:
 	[ -e $@ ] || touch $@
 	flock -en $@ true
 
+.PHONY: .stack-work.lock
+.stack-work.lock:
+	[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
+
 .PHONY: .develop.env
 .develop.env:
 	[[ ! -z "$(CI)" || ! -z "$$PORT_OFFSET" ]] || ( echo "Not in develop!" 2>&1 ; exit 1 )