diff --git a/roles/wordpress/defaults/main.yml b/roles/wordpress/defaults/main.yml
index 10a56c5..d25e50f 100644
--- a/roles/wordpress/defaults/main.yml
+++ b/roles/wordpress/defaults/main.yml
@@ -10,3 +10,5 @@ wordpress_symlinks: false
 wordpress_php_memory_limit: 256M
 wordpress_php_post_max_size: 128M
 wordpress_php_upload_max_filesize: 32M
+wordpress_php_max_execution_time: 30
+wordpress_php_max_input_time: 60
diff --git a/roles/wordpress/templates/php.ini.j2 b/roles/wordpress/templates/php.ini.j2
index f753dd9..06a8e83 100644
--- a/roles/wordpress/templates/php.ini.j2
+++ b/roles/wordpress/templates/php.ini.j2
@@ -3,3 +3,5 @@
 memory_limit = {{ wordpress_php_memory_limit }}
 post_max_size = {{ wordpress_php_post_max_size }}
 upload_max_filesize = {{ wordpress_php_upload_max_filesize }}
+max_execution_time = {{ wordpress_php_max_execution_time }}
+max_input_time = {{ wordpress_php_max_input_time }}