diff --git a/dockerfiles/database/Makefile b/dockerfiles/database/Makefile
index 97cc180..231800f 100644
--- a/dockerfiles/database/Makefile
+++ b/dockerfiles/database/Makefile
@@ -6,13 +6,18 @@
 
 .PHONY: start_db
 
+STACKNAME = dbstack
+
 all: run_stack create_users
 
 run_stack:
-	docker stack deploy --compose-file mongo-stack.yml dbstack
+	docker stack deploy --compose-file mongodb-stack.yml $(STACKNAME)
+
+create.js:
+	echo -e 'db.auth("$(DB_ADM_USER)", "$(DB_ADM_PASS)")\n \
+		use valdb\n \
+		db.createUser({user: "kristjan", pwd: "password", roles: ["readWrite"]})' > create.js
 
-create_users:
-	docker exec -it mongo-container /bin/bash
-	mongo -u root -p example
-	use valDB
-	db.createUser({user: "kristjan", pwd: "password", roles: ["readWrite"]})
+create_users: create.js
+	docker exec $(shell ./get_container_name.sh) mongo admin < create.js
+	# rm create.js
diff --git a/dockerfiles/database/create.js b/dockerfiles/database/create.js
new file mode 100644
index 0000000..907d726
--- /dev/null
+++ b/dockerfiles/database/create.js
@@ -0,0 +1,5 @@
+db.auth("testuser", "testpass")
+ \
+	use valdb
+ \
+	db.createUser({user: "kristjan", pwd: "password", roles: ["readWrite"]})
diff --git a/dockerfiles/database/get_container_name.sh b/dockerfiles/database/get_container_name.sh
new file mode 100755
index 0000000..5cd6681
--- /dev/null
+++ b/dockerfiles/database/get_container_name.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker ps | grep mongo:latest | awk '{print $1}'