diff --git a/roles/nginx/php-pool/defaults/main.yml b/roles/nginx/php-pool/defaults/main.yml
index 557149e..a9e2e70 100644
--- a/roles/nginx/php-pool/defaults/main.yml
+++ b/roles/nginx/php-pool/defaults/main.yml
@@ -9,6 +9,13 @@ socket: "{{ socket_directory }}/socket"
 allow_overwrite_includes: no
 includes: []
 env_vars: {}
-memory_limit: 0 # unlimited
+admin_values: {}
 
 # status_page_path: "/status" # Disabled by default
+
+default_admin_values:
+  memory_limit: None # unlimited
+
+enforced_admin_values: {}
+
+effective_admin_values: "{{ default_admin_values | combine(admin_values) | combine(enforced_admin_values) }}"
diff --git a/roles/nginx/php-pool/templates/pool.conf b/roles/nginx/php-pool/templates/pool.conf
index c31e0cd..e58ed89 100644
--- a/roles/nginx/php-pool/templates/pool.conf
+++ b/roles/nginx/php-pool/templates/pool.conf
@@ -37,6 +37,6 @@ env[{{ key }}] = {{ val | quote }}
 {% if not allow_overwrite_includes %}
 php_admin_value[include_path] = ".:{{ includes | join(':') }}:/usr/share/php"
 {% endif %}
-{% if memory_limit is defined and memory_limit %}
-php_admin_value[memory_limit] = {{ memory_limit }}
-{% endif %}
+{% for key, value in admin_values.items() %}{% if value != None %}
+php_admin_value[{{ key }}] = {{ value | quote }}
+{% endif %}{% endfor %}
diff --git a/roles/server/nextcloud/meta/main.yml b/roles/server/nextcloud/meta/main.yml
index ef4db5f..6cf8acb 100644
--- a/roles/server/nextcloud/meta/main.yml
+++ b/roles/server/nextcloud/meta/main.yml
@@ -20,7 +20,8 @@ dependencies:
     src: "{{ nextcloud_installation_directory }}"
     includes:
       - "{{ nextcloud_installation_directory }}/apps"
-    memory_limit: 1G
+    admin_values:
+      memory_limit: 1G
   - role: redis/instance
     # domain
     # system_user