diff --git a/enos/modules/aws_boundary/templates/controller.hcl b/enos/modules/aws_boundary/templates/controller.hcl
index ca0f625017..d33c684fe6 100644
--- a/enos/modules/aws_boundary/templates/controller.hcl
+++ b/enos/modules/aws_boundary/templates/controller.hcl
@@ -6,6 +6,9 @@ disable_mlock = true
 controller {
   name = "boundary-controller-${id}"
   description = "Enos Boundary controller ${id}"
+
+  max_page_size = ${max_page_size}
+
   database {
     url = "postgresql://${dbuser}:${dbpass}@${dbhost}:${dbport}/${dbname}"
     max_open_connections = ${db_max_open_connections}
@@ -20,8 +23,6 @@ listener "tcp" {
   purpose = "api"
   tls_disable = true
 
-  max_page_size = ${max_page_size}
-
   # Uncomment to enable CORS for the Admin UI. Be sure to set the allowed origin(s)
   # to appropriate values.
   #cors_enabled = true
diff --git a/enos/modules/aws_boundary/templates/controller_bsr.hcl b/enos/modules/aws_boundary/templates/controller_bsr.hcl
index a0c6ac9757..8d860671ca 100644
--- a/enos/modules/aws_boundary/templates/controller_bsr.hcl
+++ b/enos/modules/aws_boundary/templates/controller_bsr.hcl
@@ -6,6 +6,9 @@ disable_mlock = true
 controller {
   name = "boundary-controller-${id}"
   description = "Enos Boundary controller ${id}"
+
+  max_page_size = ${max_page_size}
+
   database {
     url = "postgresql://${dbuser}:${dbpass}@${dbhost}:${dbport}/${dbname}"
     max_open_connections = ${db_max_open_connections}
@@ -20,8 +23,6 @@ listener "tcp" {
   purpose = "api"
   tls_disable = true
 
-  max_page_size = ${max_page_size}
-
   # Uncomment to enable CORS for the Admin UI. Be sure to set the allowed origin(s)
   # to appropriate values.
   #cors_enabled = true