diff --git a/tasks/php-fpm.yml b/tasks/php-fpm.yml
index 119437b..01d7749 100644
--- a/tasks/php-fpm.yml
+++ b/tasks/php-fpm.yml
@@ -55,6 +55,7 @@
     phpinidefault:
       post_max_size: 64M
       upload_max_filesize: 64M
+      memory_limit: 128M
 - set_fact:
     phpini: "{{ phpinidefault|combine( {} if (nginx.php == True) else nginx.php.ini|d({}) ) }}"
 
diff --git a/templates/php-fpm/php.ini.j2 b/templates/php-fpm/php.ini.j2
index f78fa10..f514a89 100644
--- a/templates/php-fpm/php.ini.j2
+++ b/templates/php-fpm/php.ini.j2
@@ -386,7 +386,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = {{ phpini.memory_limit }}
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;