diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 37e2f0a9..4678e4be 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -290,11 +290,12 @@ jobs:
         continue-on-error: true
         uses: keatonLiu/docker-compose-remote-action@v1.2
         with:
+          docker_compose_file: docker-compose.yml
+          docker_args: -d --remove-orphans --pull missing  --parallel -1
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}
           ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
-          docker_compose_file: docker-compose.yml
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
diff --git a/README.md b/README.md
index f9bdaaad..dd00fb9f 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@
 | netbird-coturn | coturn/coturn:latest |
 | netbox | lscr.io/linuxserver/netbox:latest |
 | netbox-db | postgres:17-alpine |
-| nextcloud | lscr.io/linuxserver/nextcloud:latest |
+| nextcloud | nextcloud/all-in-one:latest |
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
diff --git a/docker-compose.yml b/docker-compose.yml
index 110063da..631a456c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3718,59 +3718,35 @@ services:
         volume: {}
   nextcloud:
     container_name: nextcloud
-    depends_on:
-      mariadb:
-        condition: service_started
-        required: true
-        restart: true
     environment:
-      PGID: ${PGID}
-      PUID: ${PUID}
-      TZ: ${TZ}
+      DOCKER_HOST: tcp://dockerproxy:2375
       LOG_LEVEL: debug
-    hostname: Rinoa
-    image: lscr.io/linuxserver/nextcloud:latest
+      SKIP_DOMAIN_VALIDATION: false
+      APACHE_ADDITIONAL_NETWORK: 
+      APACHE_IP_BINDING: 0.0.0.0
+      APACHE_PORT: 11000
+    expose:
+      - 11000
+    image: nextcloud/all-in-one:latest
     labels:
       homepage.group: Personal Services
       homepage.name: NextCloud
       homepage.href: https://cloud.${MY_TLD}
-      homepage.icon: nextcloud.png
+      homepage.icon: nextcloud.svg
       homepage.description: Private Cloud
       swag: enable
+      swag_port: 11000
       swag_proto: https
       swag_url: cloud.${MY_TLD}
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://cloud.${MY_TLD}
-    networks:
-      default: null
     ports:
-      - mode: ingress
-        protocol: tcp
-        published: "444"
-        target: 443
+      - 56713:8080
     restart: unless-stopped
     volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/nextcloud
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/nextcloud
-        target: /data
-        type: bind
+      - /etc/localtime:/etc/localtime:ro
+      - ${DOCKER_VOLUME_CONFIG}/nextcloud/config:/config
+      - ${DOCKER_VOLUME_CONFIG}/nextcloud/data:/data
   ollama:
     container_name: ollama
     image: ollama/ollama