diff --git a/aws-lambda/function/pygeoapi-config.yml b/aws-lambda/function/pygeoapi-config.yml
index 0e182b2..2341464 100644
--- a/aws-lambda/function/pygeoapi-config.yml
+++ b/aws-lambda/function/pygeoapi-config.yml
@@ -38,7 +38,9 @@ server:
     language: en-US
     cors: false
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
diff --git a/django/sample_project/pygeoapi-config.yml b/django/sample_project/pygeoapi-config.yml
index bd4037c..089b9ad 100644
--- a/django/sample_project/pygeoapi-config.yml
+++ b/django/sample_project/pygeoapi-config.yml
@@ -41,7 +41,9 @@ server:
         - fr-CA
     # cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates:
       # path: /path/to/Jinja2/templates
       # static: /path/to/static/folder # css/js/img
diff --git a/docker/admin/admin.config.yml b/docker/admin/admin.config.yml
index 0726ccd..37db909 100644
--- a/docker/admin/admin.config.yml
+++ b/docker/admin/admin.config.yml
@@ -39,7 +39,9 @@ server:
         - en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
         attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
diff --git a/docker/elastic/pygeoapi/docker.config.yml b/docker/elastic/pygeoapi/docker.config.yml
index 23cf6a3..d139543 100644
--- a/docker/elastic/pygeoapi/docker.config.yml
+++ b/docker/elastic/pygeoapi/docker.config.yml
@@ -42,7 +42,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/esri/esri.config.yml b/docker/esri/esri.config.yml
index 3078a6e..dc5de9d 100644
--- a/docker/esri/esri.config.yml
+++ b/docker/esri/esri.config.yml
@@ -38,7 +38,9 @@ server:
   language: en-US
   cors: true
   pretty_print: true
-  limit: 10
+  limits:
+    default_items: 10
+    max_items: 500
   # templates: /path/to/templates
   map:
     url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/geosparql/test.pygeoapi.config.yml b/docker/geosparql/test.pygeoapi.config.yml
index ae807cd..d796102 100644
--- a/docker/geosparql/test.pygeoapi.config.yml
+++ b/docker/geosparql/test.pygeoapi.config.yml
@@ -38,7 +38,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 100
+    limits:
+        default_items: 10
+        max_items: 500
     map:
         url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
         attribution: '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap contributors</a>'
diff --git a/docker/mongo/pygeoapi/docker.config.yml b/docker/mongo/pygeoapi/docker.config.yml
index f8adaf4..c5fd069 100644
--- a/docker/mongo/pygeoapi/docker.config.yml
+++ b/docker/mongo/pygeoapi/docker.config.yml
@@ -40,7 +40,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/mvt-elastic/pygeoapi/docker.config.yml b/docker/mvt-elastic/pygeoapi/docker.config.yml
index 4455c54..527717c 100644
--- a/docker/mvt-elastic/pygeoapi/docker.config.yml
+++ b/docker/mvt-elastic/pygeoapi/docker.config.yml
@@ -38,7 +38,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/mvt-tippecanoe/pygeoapi/docker.config.yml b/docker/mvt-tippecanoe/pygeoapi/docker.config.yml
index c359b0f..398c3a7 100644
--- a/docker/mvt-tippecanoe/pygeoapi/docker.config.yml
+++ b/docker/mvt-tippecanoe/pygeoapi/docker.config.yml
@@ -38,7 +38,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/newapi/pygeoapi.config.yml b/docker/newapi/pygeoapi.config.yml
index c73401a..690d9ae 100644
--- a/docker/newapi/pygeoapi.config.yml
+++ b/docker/newapi/pygeoapi.config.yml
@@ -9,7 +9,9 @@ server:
         - en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
         attribution: <a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia
diff --git a/docker/sensorthings/brgm.config.yml b/docker/sensorthings/brgm.config.yml
index b018637..2f7034d 100644
--- a/docker/sensorthings/brgm.config.yml
+++ b/docker/sensorthings/brgm.config.yml
@@ -41,7 +41,9 @@ server:
         - fr-CA
     # cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     map:
         url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
         attribution: '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap contributors</a>'
diff --git a/docker/sensorthings/usgs.config.yml b/docker/sensorthings/usgs.config.yml
index 3aea6a8..7c72074 100644
--- a/docker/sensorthings/usgs.config.yml
+++ b/docker/sensorthings/usgs.config.yml
@@ -41,7 +41,9 @@ server:
     - fr-CA
   # cors: true
   pretty_print: true
-  limit: 10
+  limits:
+    default_items: 10
+    max_items: 500 10
   map:
     url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
     attribution: '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap contributors</a>'
diff --git a/docker/simple/my.config.yml b/docker/simple/my.config.yml
index 146a3d8..1af9a0f 100644
--- a/docker/simple/my.config.yml
+++ b/docker/simple/my.config.yml
@@ -40,7 +40,9 @@ server:
     language: en-US
     cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/docker/skin/skin.config.yml b/docker/skin/skin.config.yml
index 8715fa5..c9dc589 100644
--- a/docker/skin/skin.config.yml
+++ b/docker/skin/skin.config.yml
@@ -41,7 +41,9 @@ server:
         - fr-CA
     # cors: true
     pretty_print: true
-    limit: 10
+    limits:
+        default_items: 10
+        max_items: 50
     templates:
       path: /pygeoapi/pygeoapi-skin-dashboard-main/templates
       static: /pygeoapi/pygeoapi-skin-dashboard-main/static # css/js/img
diff --git a/docker/socrata/socrata.config.yml b/docker/socrata/socrata.config.yml
index ed07005..fe1aac4 100644
--- a/docker/socrata/socrata.config.yml
+++ b/docker/socrata/socrata.config.yml
@@ -38,7 +38,9 @@ server:
   language: en-US
   cors: true
   pretty_print: true
-  limit: 10
+  limits:
+    default_items: 10
+    max_items: 500
   # templates: /path/to/templates
   map:
     url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
diff --git a/kubernetes/base/pygeoapi/pygeoapi-config.yaml b/kubernetes/base/pygeoapi/pygeoapi-config.yaml
index 982d5d8..ab59bdf 100644
--- a/kubernetes/base/pygeoapi/pygeoapi-config.yaml
+++ b/kubernetes/base/pygeoapi/pygeoapi-config.yaml
@@ -13,7 +13,9 @@ server:
     - en-US
   cors: false
   pretty_print: true
-  limit: 10
+  limits:
+    default_items: 10
+    max_items: 500 10
   map:
     url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
     attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'