diff --git a/backend/.dockerignore b/backend/.dockerignore
index cf08abe9..da3de864 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -213,7 +213,6 @@ configs/docker.env
 configs/docker.dev.env
 configs/docker.test.env
 configs/docker.prod.env
-configs/docker.moonstreamapi.env
 
 .secrets/
 
diff --git a/backend/configs/docker_generate_env.sh b/backend/configs/docker_generate_env.sh
index d8de1910..8f31dcf3 100755
--- a/backend/configs/docker_generate_env.sh
+++ b/backend/configs/docker_generate_env.sh
@@ -2,10 +2,33 @@
 
 # Prepare Moonstream API application for docker-compose use
 
+# Print help message
+function usage {
+  echo "Usage: $0 [-h] -d DATABASE_NAME"  
+  echo
+  echo "CLI to generate environment variables"
+  echo
+  echo "Optional arguments:"
+  echo "  -h  Show this help message and exit"
+  echo "  -d  Database name for postgres in docker-compose setup"
+}
+
+FLAG_DATABASE_NAME="moonstream_dev"
+
+while getopts 'd:' flag; do
+  case "${flag}" in
+    b) FLAG_DATABASE_NAME="${OPTARG}" ;;
+    h) usage
+      exit 1 ;;
+    *) usage
+      exit 1 ;;
+  esac
+done
+
 set -e
 
 SCRIPT_DIR="$(realpath $(dirname $0))"
-DOCKER_MOONSTREAM_DB_URI="postgresql://postgres:postgres@db/moonstream_dev"
+DOCKER_MOONSTREAM_DB_URI="postgresql://postgres:postgres@db/$FLAG_DATABASE_NAME"
 DOCKER_MOONSTREAM_ENV_FILE="docker.moonstreamapi.env"
 
 # Generate environment variables
diff --git a/db/.dockerignore b/db/.dockerignore
index 50f24613..984ce5b4 100644
--- a/db/.dockerignore
+++ b/db/.dockerignore
@@ -213,9 +213,13 @@ configs/docker.env
 configs/docker.dev.env
 configs/docker.test.env
 configs/docker.prod.env
-configs/docker.moonstreamdb.env
 
 .secrets/
 
+# Alembic migrations
+configs/alembic.test.ini
+configs/alembic.dev.ini
+configs/alembic.prod.ini
+
 Dockerfile
 docker-compose.yml
diff --git a/db/configs/docker_generate_env.sh b/db/configs/docker_generate_env.sh
index 53ceed7e..ae4f3a70 100755
--- a/db/configs/docker_generate_env.sh
+++ b/db/configs/docker_generate_env.sh
@@ -2,10 +2,33 @@
 
 # Prepare Moonstream DB application for docker-compose use
 
+# Print help message
+function usage {
+  echo "Usage: $0 [-h] -d DATABASE_NAME"  
+  echo
+  echo "CLI to generate environment variables"
+  echo
+  echo "Optional arguments:"
+  echo "  -h  Show this help message and exit"
+  echo "  -d  Database name for postgres in docker-compose setup"
+}
+
+FLAG_DATABASE_NAME="moonstream_dev"
+
+while getopts 'd:' flag; do
+  case "${flag}" in
+    b) FLAG_DATABASE_NAME="${OPTARG}" ;;
+    h) usage
+      exit 1 ;;
+    *) usage
+      exit 1 ;;
+  esac
+done
+
 set -e
 
 SCRIPT_DIR="$(realpath $(dirname $0))"
-DOCKER_MOONSTREAMDB_DB_URI="postgresql://postgres:postgres@db/moonstream_dev"
+DOCKER_MOONSTREAMDB_DB_URI="postgresql://postgres:postgres@db/$FLAG_DATABASE_NAME"
 DOCKER_MOONSTREAMDB_ENV_FILE="docker.moonstreamdb.env"
 DOCKER_MOONSTREAMDB_ALEMBIC_FILE="alembic.moonstreamdb.ini"