diff --git a/scripts/ci_start_server.sh b/scripts/ci_start_server.sh
index 227283f63f82d8310e5d3f87772120c0f0c2b9f9..1e11c4b465b6b00f5668692eb956e38c5b40b40e 100644
--- a/scripts/ci_start_server.sh
+++ b/scripts/ci_start_server.sh
@@ -9,7 +9,10 @@ HIVEMIND_HTTP_PORT=$4
 
 PYTHONUSERBASE=./local-site
 
-DB_NAME=${HIVEMIND_DB_NAME/-/_}
+DB_NAME=${HIVEMIND_DB_NAME//-/_}
+DB_NAME=${DB_NAME//\[/_}
+DB_NAME=${DB_NAME//]/_}
+
 DB_URL=$HIVEMIND_POSTGRESQL_CONNECTION_STRING/$DB_NAME
 
 echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
diff --git a/scripts/ci_sync.sh b/scripts/ci_sync.sh
index 06d6e9025d50649eb690986fb059b8ab185ba585..84d1422dd582c061f1c2f043c890d59100fdac55 100755
--- a/scripts/ci_sync.sh
+++ b/scripts/ci_sync.sh
@@ -9,7 +9,9 @@ HIVEMIND_MAX_BLOCK=$4
 
 PYTHONUSERBASE=./local-site
 
-DB_NAME=${HIVEMIND_DB_NAME/-/_}
+DB_NAME=${HIVEMIND_DB_NAME//-/_}
+DB_NAME=${DB_NAME//\[/_}
+DB_NAME=${DB_NAME//]/_}
 DB_URL=$HIVEMIND_POSTGRESQL_CONNECTION_STRING/$DB_NAME
 echo Corrected db name $DB_NAME
 echo Corrected db url $DB_URL