diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 9bbb04e..e5e8e8a 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -36,6 +36,15 @@
     group: apache
   tags:
   - config
+- name: ensure php is configured for nextcloud
+  template:
+    src: php.ini.j2
+    dest: /etc/php.d/60-nextcloud.ini
+    mode: '0644'
+  notify:
+  - restart php-fpm
+  tags:
+  - php-config
 
 - name: ensure php-fpm is configured for nextcloud
   template:
diff --git a/roles/nextcloud/templates/config.php.j2 b/roles/nextcloud/templates/config.php.j2
index 21bc8a0..0627794 100644
--- a/roles/nextcloud/templates/config.php.j2
+++ b/roles/nextcloud/templates/config.php.j2
@@ -47,6 +47,8 @@ $CONFIG = array (
   'ldapIgnoreNamingRules' => false,
   'ldapProviderFactory' => 'OCA\\User_LDAP\\LDAPProviderFactory',
   'maintenance' => {{ nextcloud_maintenance|bool|string|lower }},
+  'maintenance_window_start' => 6,
+  'default_phone_region' => 'US',
   'theme' => '',
   'trashbin_retention_obligation' => 'auto, 30',
   'loglevel' => 2,
diff --git a/roles/nextcloud/templates/nextcloud.httpd.conf.j2 b/roles/nextcloud/templates/nextcloud.httpd.conf.j2
index d66f835..f20ae47 100644
--- a/roles/nextcloud/templates/nextcloud.httpd.conf.j2
+++ b/roles/nextcloud/templates/nextcloud.httpd.conf.j2
@@ -19,6 +19,10 @@ Dav off
 
 <IfModule mod_rewrite.c>
   Options -MultiViews
+  RewriteRule ^\.well-known/carddav /remote.php/dav [R=301,L]
+  RewriteRule ^\.well-known/caldav /remote.php/dav [R=301,L]
+  RewriteRule ^\.well-known/webfinger /index.php/.well-known/webfinger [R=301,L]
+  RewriteRule ^\.well-known/nodeinfo /index.php/.well-known/nodeinfo [R=301,L]
   RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]
   RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]
   RewriteCond %{REQUEST_FILENAME} !\.(css|js|mjs|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4)$
@@ -56,7 +60,3 @@ Require all granted
 <Directory /var/lib/nextcloud/data/>
 Require all granted
 </Directory>
-
-Redirect 301 /.well-known/carddav /remote.php/carddav
-Redirect 301 /.well-known/caldav /remote.php/caldav
-Redirect 301 /.well-known/webdav /remote.php/webdav
diff --git a/roles/nextcloud/templates/php.ini.j2 b/roles/nextcloud/templates/php.ini.j2
new file mode 100644
index 0000000..c560a41
--- /dev/null
+++ b/roles/nextcloud/templates/php.ini.j2
@@ -0,0 +1,4 @@
+apc.enable_cli=1
+memory_limit=1024M
+opcache.interned_strings_buffer=100
+opcache.memory_consumption=256
diff --git a/roles/nextcloud/templates/www.php-fpm.conf.j2 b/roles/nextcloud/templates/www.php-fpm.conf.j2
index bd8e364..7e64c38 100644
--- a/roles/nextcloud/templates/www.php-fpm.conf.j2
+++ b/roles/nextcloud/templates/www.php-fpm.conf.j2
@@ -423,7 +423,7 @@ slowlog = /var/log/php-fpm/www-slow.log
 ;php_flag[display_errors] = off
 php_admin_value[error_log] = /var/log/php-fpm/www-error.log
 php_admin_flag[log_errors] = on
-php_admin_value[memory_limit] = 512M
+;php_admin_value[memory_limit] = 512M
 
 ; Set the following data paths to directories owned by the FPM process user.
 ;