diff --git a/compose/grafana/docker-compose.yml b/compose/grafana/docker-compose.yml
index 5e3231a..9c52ddc 100644
--- a/compose/grafana/docker-compose.yml
+++ b/compose/grafana/docker-compose.yml
@@ -1,47 +1,38 @@
-version: '3'
+version: '3.8'
 
 volumes:
-  alertmanager_config:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=dockerstorage,rw,nfsvers=4
-      device: :/swarm/stacks/grafana/alertmanager_config
-  prometheus_config:
-    driver_opts:
-      type: nfs
-      o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/prometheus_config
-  grafana_config:
-    driver_opts:
-      type: nfs
-      o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/grafana_config
-
   prometheus_data:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/prometheus_data
+      device: :/dockerstorage/grafana/prometheus
 
   grafana_data:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/grafana_data
+      device: :/dockerstorage/grafana/grafana
 
   loki_data:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/loki_data
+      device: :/dockerstorage/grafana/loki
 
   influxdb_data:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/grafana/influxdb_data
+      device: :/dockerstorage/grafana/influxdb
 
+configs:
+  prometheus_config:
+    external: true
+  grafana_config:
+    external: true
+  alertmanager_config:
+    external: true
+  
 
 services:
 #  redis:
@@ -75,9 +66,9 @@ services:
     image: prom/alertmanager
     environment:
       - TZ=Europe/Berlin #change Time Zone if needed
-
-    volumes:
-      - alertmanager_config:/etc/alertmanager
+    configs:
+      - source: alertmanager_config
+        target: /etc/alertmanager/alertmanager.conf
     command:
       - '--config.file=/etc/alertmanager/alertmanager.conf'
     ports:
@@ -89,8 +80,10 @@ services:
     image: prom/prometheus
     environment:
       - TZ=Europe/Berlin #change Time Zone if needed
+    configs:
+      - source: prometheus_config
+        target: /etc/prometheus/prometheus.yml
     volumes:
-      - prometheus_config:/etc/prometheus
       - prometheus_data:/prometheus
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
@@ -107,8 +100,10 @@ services:
       - influx
     environment:
       - TZ=Europe/Amsterdam
+    configs:
+      - source: grafana_config
+        target: /etc/grafana/grafana.ini
     volumes:
-      - grafana_config:/etc/grafana
       - grafana_data:/var/lib/grafana
     ports:
       - 3300:3000
diff --git a/compose/nextcloud/docker-compose.yml b/compose/nextcloud/docker-compose.yml
index 1135674..0352f59 100644
--- a/compose/nextcloud/docker-compose.yml
+++ b/compose/nextcloud/docker-compose.yml
@@ -5,29 +5,24 @@ volumes:
     driver_opts:
       type: nfs 
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/nextcloud/nchome
-  ncconfig:
-    driver_opts:
-      type: nfs
-      o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/nextcloud/ncconfig
+      device: :/dockerstorage/nextcloud/nchome
   ncdata:
     driver_opts:
       type: nfs
-      o: addr=dockerstorage,nfsvers=4
+      o: addr=maurice,nfsvers=4
       device: :/nextcloud_data
 
   ncredis:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/nextcloud/redis
+      device: :/dockerstorage/nextcloud/redis
 
   ncdatabase:
     driver_opts:
       type: nfs
       o: addr=dockerstorage,nfsvers=4
-      device: :/swarm/stacks/nextcloud/ncdatabase
+      device: :/dockerstorage/nextcloud/ncdatabase
 
   pictures:
     driver_opts:
@@ -46,7 +41,6 @@ services:
       - TZ=Europe/Berlin #change Time Zone if needed
       - REDIS_HOST=redis
     volumes:
-#     - ncconfig:/var/www/html/config #/srv/dev-disk-by-label-disk1 needs to be adjusted
      - ncdata:/var/www/html/data     #/srv/dev-disk-by-label-disk1 needs to be adjusted
      - nchome:/var/www/html          #/srv/dev-disk-by-label-disk1 needs to be adjusted
       # NAS shares
@@ -66,11 +60,12 @@ services:
       - ncredis:/var/lib/redis
 
   mariadb:
+    user: "1000:100"
     image: ghcr.io/linuxserver/mariadb
     container_name: nextclouddb
     environment:
-      - PUID=1000 #change PUID if needed
-      - PGID=1000  #change PGID if needed
+#      - PUID=1000 #change PUID if needed
+#      - PGID=100  #change PGID if needed
       - MARIADB_ROOT_PASSWORD="dbpassword"
       - MYSQL_ROOT_PASSWORD=mariadbpassword  #change password
       - TZ=Europe/Berlin #Change Time Zone if needed