diff --git a/server/constants/constants.go b/server/constants/constants.go
index b61db88..e5ad0aa 100644
--- a/server/constants/constants.go
+++ b/server/constants/constants.go
@@ -6,6 +6,7 @@ var (
 	VERSION                      = ""
 	DATABASE_TYPE                = ""
 	DATABASE_URL                 = ""
+	DATABASE_NAME                = ""
 	SMTP_HOST                    = ""
 	SMTP_PORT                    = ""
 	SENDER_EMAIL                 = ""
diff --git a/server/db/arangodb.go b/server/db/arangodb.go
index 80305c7..e8eb1b1 100644
--- a/server/db/arangodb.go
+++ b/server/db/arangodb.go
@@ -32,21 +32,19 @@ func initArangodb() (arangoDriver.Database, error) {
 
 	var arangodb driver.Database
 
-	// TODO use dynamic name based on env
-	dbName := "authorizer"
-	arangodb_exists, err := client.DatabaseExists(nil, dbName)
+	arangodb_exists, err := client.DatabaseExists(nil, constants.DATABASE_NAME)
 
 	if arangodb_exists {
-		log.Println(dbName + " db exists already")
+		log.Println(constants.DATABASE_NAME + " db exists already")
 
-		arangodb, err = client.Database(nil, dbName)
+		arangodb, err = client.Database(nil, constants.DATABASE_NAME)
 
 		if err != nil {
 			return nil, err
 		}
 
 	} else {
-		arangodb, err = client.CreateDatabase(nil, dbName, nil)
+		arangodb, err = client.CreateDatabase(nil, constants.DATABASE_NAME, nil)
 
 		if err != nil {
 			return nil, err
diff --git a/server/env.go b/server/env.go
index c3882bb..2a99e42 100644
--- a/server/env.go
+++ b/server/env.go
@@ -43,6 +43,7 @@ func InitEnv() {
 	constants.ENV = os.Getenv("ENV")
 	constants.DATABASE_TYPE = os.Getenv("DATABASE_TYPE")
 	constants.DATABASE_URL = os.Getenv("DATABASE_URL")
+	constants.DATABASE_NAME = os.Getenv("DATABASE_NAME")
 	constants.SMTP_HOST = os.Getenv("SMTP_HOST")
 	constants.SMTP_PORT = os.Getenv("SMTP_PORT")
 	constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
@@ -115,6 +116,10 @@ func InitEnv() {
 		panic("Database type is required")
 	}
 
+	if constants.DATABASE_NAME == "" {
+		constants.DATABASE_NAME = "authorizer"
+	}
+
 	if constants.JWT_TYPE == "" {
 		constants.JWT_TYPE = "HS256"
 	}