diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index 428ba55cf..c7eebcd63 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -113,7 +113,7 @@ AppendGrantOnDatabaseStmt(StringInfo buf, GrantStmt *stmt)
 }
 
 
-static void
+static bool
 AppendBasicAlterDatabaseOptions(StringInfo buf, DefElem *def, bool
 								prefix_appended_for_basic_options, char *dbname)
 {
@@ -124,6 +124,7 @@ AppendBasicAlterDatabaseOptions(StringInfo buf, DefElem *def, bool
 	}
 	optionToStatement(buf, def, alter_database_option_formats, lengthof(
 						  alter_database_option_formats));
+	return prefix_appended_for_basic_options;
 }
 
 
@@ -152,9 +153,11 @@ AppendAlterDatabaseStmt(StringInfo buf, AlterDatabaseStmt *stmt)
 			}
 			else
 			{
-				AppendBasicAlterDatabaseOptions(buf, def,
-												prefix_appended_for_basic_options,
-												stmt->dbname);
+				prefix_appended_for_basic_options = AppendBasicAlterDatabaseOptions(buf,
+																					def,
+																					prefix_appended_for_basic_options,
+																					stmt->
+																					dbname);
 			}
 		}
 	}
diff --git a/src/test/regress/expected/alter_database_propagation.out b/src/test/regress/expected/alter_database_propagation.out
index 0ce217749..63d69418d 100644
--- a/src/test/regress/expected/alter_database_propagation.out
+++ b/src/test/regress/expected/alter_database_propagation.out
@@ -1,38 +1,30 @@
 set citus.log_remote_commands = true;
 set citus.grep_remote_commands = '%ALTER DATABASE%';
--- since ALLOW_CONNECTIONS alter option should be executed in a different database
--- and since we don't have a multiple database support for now,
--- this statement will get error
-alter database regression ALLOW_CONNECTIONS false;
-ERROR:  ALLOW_CONNECTIONS is not supported
 alter database regression with CONNECTION LIMIT 100;
-NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION LIMIT 100;
+NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION_LIMIT 100;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION LIMIT 100;
+NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION_LIMIT 100;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 alter database regression with IS_TEMPLATE true CONNECTION LIMIT 50;
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'true' CONNECTION LIMIT 50;
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE true CONNECTION_LIMIT 50;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'true' CONNECTION LIMIT 50;
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE true CONNECTION_LIMIT 50;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 alter database regression with CONNECTION LIMIT -1;
-NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION LIMIT -1;
+NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION_LIMIT -1;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION LIMIT -1;
+NOTICE:  issuing ALTER DATABASE regression WITH  CONNECTION_LIMIT -1;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 alter database regression with IS_TEMPLATE true;
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'true';
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE true;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'true';
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE true;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 alter database regression with IS_TEMPLATE false;
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'false';
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE false;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing ALTER DATABASE regression WITH IS_TEMPLATE 'false';
+NOTICE:  issuing ALTER DATABASE regression WITH  IS_TEMPLATE false;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
--- this statement will get error since we don't have a multiple database support for now
-alter database regression rename to regression2;
-ERROR:  current database cannot be renamed
 alter database regression set default_transaction_read_only = true;
 NOTICE:  issuing ALTER DATABASE regression SET default_transaction_read_only = 'true'
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
@@ -147,4 +139,28 @@ NOTICE:  issuing ALTER DATABASE regression RESET lock_timeout
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing ALTER DATABASE regression RESET lock_timeout
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+set citus.enable_create_database_propagation=on;
+create database regression2;
+alter database regression2 with CONNECTION LIMIT 100;
+NOTICE:  issuing ALTER DATABASE regression2 WITH  CONNECTION_LIMIT 100;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing ALTER DATABASE regression2 WITH  CONNECTION_LIMIT 100;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+alter database regression2 with IS_TEMPLATE true CONNECTION LIMIT 50;
+NOTICE:  issuing ALTER DATABASE regression2 WITH  IS_TEMPLATE true CONNECTION_LIMIT 50;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing ALTER DATABASE regression2 WITH  IS_TEMPLATE true CONNECTION_LIMIT 50;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+alter database regression2 with IS_TEMPLATE false;
+NOTICE:  issuing ALTER DATABASE regression2 WITH  IS_TEMPLATE false;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing ALTER DATABASE regression2 WITH  IS_TEMPLATE false;
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+alter database regression2 rename to regression3;
+NOTICE:  issuing ALTER DATABASE regression2 RENAME TO regression3
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+NOTICE:  issuing ALTER DATABASE regression2 RENAME TO regression3
+DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
+drop database regression3;
 set citus.log_remote_commands = false;
+set citus.enable_create_database_propagation=off;
diff --git a/src/test/regress/sql/alter_database_propagation.sql b/src/test/regress/sql/alter_database_propagation.sql
index 2b9d3ac33..e36949a9d 100644
--- a/src/test/regress/sql/alter_database_propagation.sql
+++ b/src/test/regress/sql/alter_database_propagation.sql
@@ -1,20 +1,12 @@
 set citus.log_remote_commands = true;
 set citus.grep_remote_commands = '%ALTER DATABASE%';
 
-
--- since ALLOW_CONNECTIONS alter option should be executed in a different database
--- and since we don't have a multiple database support for now,
--- this statement will get error
-alter database regression ALLOW_CONNECTIONS false;
-
-
 alter database regression with CONNECTION LIMIT 100;
 alter database regression with IS_TEMPLATE true CONNECTION LIMIT 50;
 alter database regression with CONNECTION LIMIT -1;
 alter database regression with IS_TEMPLATE true;
 alter database regression with IS_TEMPLATE false;
--- this statement will get error since we don't have a multiple database support for now
-alter database regression rename to regression2;
+
 
 alter database regression set default_transaction_read_only = true;
 
@@ -56,4 +48,15 @@ alter database regression set lock_timeout from current;
 alter database regression set lock_timeout to DEFAULT;
 alter database regression RESET lock_timeout;
 
+set citus.enable_create_database_propagation=on;
+create database regression2;
+alter database regression2 with CONNECTION LIMIT 100;
+alter database regression2 with IS_TEMPLATE true CONNECTION LIMIT 50;
+alter database regression2 with IS_TEMPLATE false;
+
+alter database regression2 rename to regression3;
+
+drop database regression3;
+
 set citus.log_remote_commands = false;
+set citus.enable_create_database_propagation=off;