diff --git a/states/roles/maintain/nextcloud/init.sls b/states/roles/maintain/nextcloud/init.sls
index de22f2e..60ed7f1 100644
--- a/states/roles/maintain/nextcloud/init.sls
+++ b/states/roles/maintain/nextcloud/init.sls
@@ -5,7 +5,14 @@ nextcloud-pkgs:
       - php-gd
       - php-intl
       - nginx
-#      - collabora-online-server-nodocker
+      - openldap
+
+/etc/webapps/nextcloud/config/config.php:
+  file.managed:
+    - source: salt://roles/maintain/nextcloud/nextcloud-config.php
+    - user: nextcloud
+    - group: nextcloud
+    - mode: 644
     
 /etc/pacman.d/hooks/nextcloud.hook:
   file.managed:
@@ -15,41 +22,64 @@ nextcloud-pkgs:
     - mode: 644
     - makedirs: true
     
-/etc/php/php.ini:
+/etc/webapps/nextcloud/php.ini:
   file.managed:
-    - source: salt://roles/maintain/nextcloud/php.ini
+    - source: salt://roles/maintain/nextcloud/nextcloud-php.ini
+    - user: root
+    - group: root
+    - mode: 644
+
+/etc/php/php-fpm.ini:
+  file.managed:
+    - source: salt://roles/maintain/nextcloud/php-fpm.ini
     - user: root
     - group: root
     - mode: 644
     
-rtorrent-php-fpm:
+nextcloud-php-fpm:
   pkg.installed:
     - name: php-fpm
   service.running:
     - name: php-fpm
     - enable: true
     - watch:
-      - file: /etc/php/php.ini
-      
+      - file: /etc/webapps/nextcloud/php.ini
+      - file: /etc/php/php-fpm.ini
+      - file: /etc/php/php-fpm.d/nextcloud.conf
+
+/etc/php/php-fpm.d/nextcloud.conf:
+  file.managed:
+    - source: salt://roles/maintain/nextcloud/php-fpm-nextcloud.conf
+    - user: root
+    - group: root
+    - mode: 644
+
 /etc/nginx/conf.d/nextcloud.conf:
   file.managed:
     - source: salt://roles/maintain/nextcloud/nginx-nextcloud.conf
     - user: root
     - group: root
     - mode: 644
-      
-#/etc/nginx/conf.d/collabora.conf:
-#  file.managed:
-#    - source: salt://roles/maintain/nextcloud/nginx-collabora.conf
-#    - user: root
-#    - group: root
-#    - mode: 644
-    
-mount:
-  group.present:
-    - gid: 503
-    - addusers:
-      - http
+
+/etc/systemd/system/nextcloud-cron.service.d/override.conf:
+  file.managed:
+    - source: salt://roles/maintain/nextcloud/cron-override.conf
+    - user: root
+    - group: root
+    - mode: 644
+
+/etc/systemd/system/php-fpm.service.d/override.conf 
+  file.managed:
+    - source: salt://roles/maintain/nextcloud/php-fpm-override.conf
+    - user: root
+    - group: root
+    - mode: 644
+     
+#mount:
+#  group.present:
+#    - gid: 503
+#    - addusers:
+#      - http
 
 nginx-service:
   service.running:
diff --git a/states/roles/maintain/nextcloud/php.ini b/states/roles/maintain/nextcloud/nextcloud-php.ini
similarity index 100%
rename from states/roles/maintain/nextcloud/php.ini
rename to states/roles/maintain/nextcloud/nextcloud-php.ini
diff --git a/states/roles/maintain/nextcloud/php-fpm-nextcloud.ini b/states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
similarity index 100%
rename from states/roles/maintain/nextcloud/php-fpm-nextcloud.ini
rename to states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
diff --git a/states/roles/maintain/nextcloud/php-fpm.ini b/states/roles/maintain/nextcloud/php-fpm.ini
index a81f205..6b0c8db 100644
--- a/states/roles/maintain/nextcloud/php-fpm.ini
+++ b/states/roles/maintain/nextcloud/php-fpm.ini
@@ -923,7 +923,7 @@ extension=curl
 ;extension=iconv
 ;extension=imap
 ;extension=intl
-;extension=ldap
+extension=ldap
 ;extension=mysqli
 ;extension=odbc
 zend_extension=opcache