diff --git a/playbooks/apps/all.yaml b/playbooks/apps/all.yaml
index fb51fa4..3d874b1 100644
--- a/playbooks/apps/all.yaml
+++ b/playbooks/apps/all.yaml
@@ -14,7 +14,7 @@
 - import_playbook: manuels.yaml # noqa: name[play]
 - import_playbook: media.yaml # noqa: name[play]
 - import_playbook: miniflux.yaml # noqa: name[play]
-- import_playbook: nextcloud.yaml # noqa: name[play]
+- import_playbook: nextcloud-aio.yaml # noqa: name[play]
 - import_playbook: portainer.yaml # noqa: name[play]
 - import_playbook: privatebin.yaml # noqa: name[play]
 - import_playbook: shortener.yaml # noqa: name[play]
diff --git a/playbooks/apps/files/Caddyfile b/playbooks/apps/files/Caddyfile
index cb2f34a..4bacd49 100644
--- a/playbooks/apps/files/Caddyfile
+++ b/playbooks/apps/files/Caddyfile
@@ -68,14 +68,6 @@ checkout.augendre.info {
 
 cloud.augendre.info {
 	import common_headers
-	route /push/* {
-		uri strip_prefix /push
-		reverse_proxy localhost:8004
-	}
-	# rewrite to suppress carddav/caldav warning
-	# in nextcloud settings
-	rewrite /.well-known/carddav /remote.php/dav/
-	rewrite /.well-known/caldav /remote.php/dav/
 	reverse_proxy localhost:8003
 }
 
@@ -129,11 +121,6 @@ tcl.augendre.info {
 	reverse_proxy localhost:8013
 }
 
-cloud-aio.augendre.info {
-	import common_headers
-	reverse_proxy localhost:8014
-}
-
 ## Ghost blogs (ports >=2368)
 #########################################################
 
diff --git a/playbooks/apps/files/bin/restic-excludes b/playbooks/apps/files/bin/restic-excludes
index 188e34e..f3bb319 100644
--- a/playbooks/apps/files/bin/restic-excludes
+++ b/playbooks/apps/files/bin/restic-excludes
@@ -22,3 +22,4 @@ prometheus_data
 .es_temp_file
 timemachine
 elastic_data
+nextcloud-aio
diff --git a/playbooks/apps/files/nextcloud-aio/docker-compose.yaml b/playbooks/apps/files/nextcloud-aio/docker-compose.yaml
index 35faf0b..edd9f31 100644
--- a/playbooks/apps/files/nextcloud-aio/docker-compose.yaml
+++ b/playbooks/apps/files/nextcloud-aio/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
     environment:
-      APACHE_PORT: 8014
+      APACHE_PORT: 8003
       APACHE_IP_BINDING: 127.0.0.1
       NEXTCLOUD_DATADIR: /mnt/data/nextcloud-aio/nextcloud_data
       NEXTCLOUD_ENABLE_DRI_DEVICE: true # This allows to enable the /dev/dri device in the Nextcloud container. ⚠️⚠️⚠️ Warning: this only works if the '/dev/dri' device is present on the host! If it should not exist on your host, don't set this to true as otherwise the Nextcloud container will fail to start! See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-transcoding-for-nextcloud
diff --git a/playbooks/apps/files/nextcloud/README.md b/playbooks/apps/files/nextcloud/README.md
deleted file mode 100644
index e8d7e79..0000000
--- a/playbooks/apps/files/nextcloud/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-To get help: `occ help <command>`
-To list commands: `occ list`
-
-## Examples
-Rescan file for modifications that happened outside nextcloud (e.g. on the filesystem directly).
-
-```bash
-/usr/bin/docker-compose -f /home/gaugendre/nextcloud/docker-compose.yaml exec --user www-data nextcloud php occ files:scan -p gaugendre/files/Photos
-```
-
-Calling `files:scan` without arguments will scan all files for all users. This may take a very long time.
-Scope to a user or a path instead.
diff --git a/playbooks/apps/files/nextcloud/docker-compose.yaml b/playbooks/apps/files/nextcloud/docker-compose.yaml
deleted file mode 100644
index ed89eec..0000000
--- a/playbooks/apps/files/nextcloud/docker-compose.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-services:
-  nextcloud:
-    build:
-      context: nextcloud_build
-      pull: true
-    image: nextcloud_local
-    restart: always
-    ports:
-      - "8003:80"
-    volumes:
-      - ./nextcloud_data:/var/www/html
-    env_file: nextcloud.env
-    depends_on:
-      - db
-      - redis
-    mem_limit: 1g
-    cpus: 3
-  fulltextsearchindex:
-    build:
-      context: nextcloud_build
-      pull: true
-    image: nextcloud_local
-    restart: always
-    working_dir: /var/www/html
-    command: /var/www/html/occ fulltextsearch:live -q
-    user: '33:33'
-    volumes:
-      - ./nextcloud_data:/var/www/html
-    env_file: nextcloud.env
-    depends_on:
-      - db
-      - elasticsearch
-    mem_limit: 100m
-    cpus: 1
-  notify_push:
-    build:
-      context: nextcloud_build
-      pull: true
-    image: nextcloud_local
-    working_dir: /var/www/html/config
-    command: /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push config.php
-    restart: always
-    volumes:
-      - ./nextcloud_data:/var/www/html:ro
-    env_file: nextcloud.env
-    environment:
-      RUST_BACKTRACE: full
-      COLORBT_SHOW_HIDDEN: 1
-#      NEXTCLOUD_URL: http://nextcloud/
-    depends_on:
-      - nextcloud
-    ports:
-      - "8004:7867"
-    mem_limit: 150m
-  db:
-    image: postgres:15
-    restart: always
-    env_file: postgres.env
-    volumes:
-      - ./db_data:/var/lib/postgresql/data
-    mem_limit: 1g
-  redis:
-    image: redis:7
-    restart: always
-    mem_limit: 150m
-  elasticsearch:
-    image: custom-elastic
-    build:
-      context: ./elasticsearch/
-      pull: true
-      args:
-        ELASTIC_VERSION: "8.9.2"
-    restart: always
-    env_file: elasticsearch.env
-    mem_limit: 8g
-    volumes:
-      - ./elastic_data:/usr/share/elasticsearch/data
-      - ./elastic_backups:/backups
-  kibana:
-    image: docker.elastic.co/kibana/kibana:8.9.1
-    restart: always
-    env_file: kibana.env
-    ports:
-      - "9009:5601"
-    volumes:
-      - ./kibana_data:/usr/share/kibana/data
-      - ./elastic_backups:/backups
-    depends_on:
-      - elasticsearch
diff --git a/playbooks/apps/files/nextcloud/update b/playbooks/apps/files/nextcloud/update
deleted file mode 100755
index 07e6ab5..0000000
--- a/playbooks/apps/files/nextcloud/update
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker compose build --pull elasticsearch nextcloud; docker compose pull kibana redis db; docker compose up -d
diff --git a/playbooks/apps/nextcloud.yaml b/playbooks/apps/nextcloud.yaml
deleted file mode 100644
index 3bc2171..0000000
--- a/playbooks/apps/nextcloud.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- name: Nextcloud
-  hosts: servers
-  gather_facts: false
-  tasks:
-    - name: Docker
-      ansible.builtin.include_role:
-        name: docker
-
-  vars:
-    docker_app_name: nextcloud
-    elastic_password: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      64313934396132333838376166663339376237643937366632636637323330303933343166303536
-      3138643465363162666237663032663165313837643763620a346662613162353337313436346335
-      63323765626463613535326564643262646431616531396361393864356237383663646666643330
-      3230653437316139630a653362653732626565353636383965303235633536646331313938613539
-      61313532653930333564613461363937643930313334373665353066323737346664
-    kibana_password: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      66326232323830316662373432326633396462366365656232306330343531363935393835306263
-      3963323930343533353336386633313465386264366130610a376331643364363436306161373239
-      66333833373038393761626438646530373831666637366634643462343936386635633135663436
-      6435336238376132610a303230613730313164653633656432633433356465643839376434396339
-      37633034623438623561373634653737323963326137663964396362356339326461
-    postgres_password: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      33656534393864633765356638633666343931396439343133643966333534383430373561386539
-      3266316439626465386234636533656231333930356632390a336631376266653038383837613861
-      33666239333333363536363338343639653535666161643965643338363562333230646263303032
-      3861623231343265640a663030316336393230633734643036633738393837353735313335343535
-      63383663363366336236653361623732383135333037613432393466626632353830323063663838
-      61333133303962363931633637646237343433303361656232653038323935623932333836663535
-      38613534316332393364363034366535373037373861363736613639656362643564393932356465
-      65626462626363633930
diff --git a/playbooks/apps/templates/nextcloud/elasticsearch.env.j2 b/playbooks/apps/templates/nextcloud/elasticsearch.env.j2
deleted file mode 100644
index 40df803..0000000
--- a/playbooks/apps/templates/nextcloud/elasticsearch.env.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-discovery.type=single-node
-xpack.security.enabled=true
-ES_JAVA_OPTS=-Xms2g -Xmx2g
-ELASTIC_PASSWORD={{ elastic_password }}
-KIBANA_PASSWORD={{ kibana_password }}
-path.repo=/backups
diff --git a/playbooks/apps/templates/nextcloud/kibana.env.j2 b/playbooks/apps/templates/nextcloud/kibana.env.j2
deleted file mode 100644
index cbd1072..0000000
--- a/playbooks/apps/templates/nextcloud/kibana.env.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-ELASTICSEARCH_HOSTS=http://elasticsearch:9200
-ELASTICSEARCH_USERNAME=kibana_system
-ELASTICSEARCH_PASSWORD={{ kibana_password }}
diff --git a/playbooks/apps/templates/nextcloud/nextcloud.env.j2 b/playbooks/apps/templates/nextcloud/nextcloud.env.j2
deleted file mode 100644
index 9af6210..0000000
--- a/playbooks/apps/templates/nextcloud/nextcloud.env.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
-POSTGRES_PASSWORD={{ postgres_password }}
-POSTGRES_HOST=db
-
-NEXTCLOUD_TRUSTED_DOMAINS=cloud.augendre.info
-
-REDIS_HOST=redis
-OVERWRITEHOST=cloud.augendre.info
-OVERWRITEPROTOCOL=https
-TRUSTED_PROXIES=172.0.0.0/8
-APACHE_DISABLE_REWRITE_IP=1
diff --git a/playbooks/apps/templates/nextcloud/postgres.env.j2 b/playbooks/apps/templates/nextcloud/postgres.env.j2
deleted file mode 100644
index dca9bc8..0000000
--- a/playbooks/apps/templates/nextcloud/postgres.env.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-POSTGRES_USER=nextcloud
-POSTGRES_PASSWORD={{ postgres_password }}