diff --git a/Makefile b/Makefile
index f7a2e4bb2..d1d66d839 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ help:
 clean:
 	$(MAKE) stop
 	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known
-	-rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc .stack-work.lock
+	-rm -rf .stack-work .stack-work-run .stack-work-test .stack-work-doc .stack-work.lock
 	-rm -rf bin .Dockerfile develop
 	-$(CONTAINER_COMMAND) container prune --force
 .PHONY: clean-all
@@ -177,7 +177,7 @@ well-known: static;
 --start-backend:
 	DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
 	DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
-	stack --work-dir .stack-work-run exec -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
+	stack --work-dir=.stack-work-run exec -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
 --start-hoogle-backend:
 	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
 	echo "${HOOGLE_PORT}" ; \
@@ -185,15 +185,15 @@ well-known: static;
 
 # HELP(compile-backend): compile backend
 --compile-backend:
-	stack build --fast --work-dir .stack-work-build --profile --library-profiling --executable-profiling --flag uniworx:-library-only --local-bin-path $$(pwd)/bin $(stackopts)
+	stack build --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only --local-bin-path $$(pwd)/bin $(stackopts)
 
 # HELP(lint-backend): lint backend
 --lint-backend:
-	stack build --test --fast --work-dir .stack-work-test --flag uniworx:library-only uniworx:test:hlint $(stackopts)
+	stack build --test --fast --work-dir=.stack-work-test --flag uniworx:library-only uniworx:test:hlint $(stackopts)
 
 # HELP(test-backend): test backend
 --test-backend:
-	stack build --test --coverage --fast --work-dir .stack-work-test --flag uniworx:library-only $(stackopts)
+	stack build --test --coverage --fast --work-dir=.stack-work-test --flag uniworx:library-only $(stackopts)
 
 # TODO: better name
 .PHONY: db
@@ -205,7 +205,7 @@ db: compile-frontend --image-build --containerized---db;
 --db-backend: .stack --compile-backend
 	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
 	AVSPASS=${AVSPASS:-nopasswordset} ; \
-	stack --work-dir .stack-work-build exec uniworxdb -- $(UNIWORXDB_OPTS)
+	stack exec uniworxdb -- $(UNIWORXDB_OPTS)
 
 .PHONY: .stack
 .stack: