diff --git a/Makefile b/Makefile
index 2d87f724d..b8ee9647e 100644
--- a/Makefile
+++ b/Makefile
@@ -176,23 +176,19 @@ serve-backend:
 --test-backend:
 	stack build --test --coverage --fast --flag uniworx:library-only $(stackopts)
 
-# TODO: maybe deprecated
-.PHONY: database
-database: .stack compile-backend-prod
-	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true}
-	export AVSPASS=$${AVSPASS:-nopasswordset}
-	stack exec uniworxdb -- $(db)
-
 .PHONY: serve-database
 serve-database: CONTAINER_INTERACTIVE=-it
 serve-database: --containerized-database
 
-.PHONY: database-%
-database-%:
-	@echo "This target, intended to fill, clear, migrate, ... the database using uniworxdb from inside the backend container is yet to be implemented"
-	exit 1
+.PHONY: %-database
+%-database:
+	$(MAKE) -- --containerized---$*-database-backend
+.PHONY: --%-database
+--%-database: .stack
+	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
+	AVSPASS=${AVSPASS:-nopasswordset} ; \
+	stack exec uniworxdb -- $*
 
-# .PHONY: .stack
 .stack: stack.yaml stack.yaml.lock
 .stack:
 	$(MAKE) -- --image-run---.stack