diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 30ac54c..f985bef 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - 'Nextcloud/**'
       - 'Caddy/**'
+      - 'Nextcloud-30/**'
     
 jobs:
 
@@ -37,6 +38,34 @@ jobs:
         tags: marcus1pierce/nextcloud:29-fpm-${{ matrix.architecture }}
         platforms: linux/${{ matrix.architecture }}
 
+  build-nextcloud-30:
+    if: contains(github.event.commits.*.modified, 'Nextcloud-30/')
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        architecture: [amd64, arm64]
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v4
+
+    - name: Setup QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Login to dockerhub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push Nextcloud Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: ./Nextcloud
+        push: true
+        tags: marcus1pierce/nextcloud:30-fpm-${{ matrix.architecture }}
+        platforms: linux/${{ matrix.architecture }}
+
   build-caddy:
     if: contains(github.event.commits.*.modified, 'Caddy/')
     runs-on: ubuntu-latest
diff --git a/Nextcloud-30/Dockerfile b/Nextcloud-30/Dockerfile
new file mode 100644
index 0000000..7997a31
--- /dev/null
+++ b/Nextcloud-30/Dockerfile
@@ -0,0 +1,22 @@
+FROM nextcloud:30.0.2-fpm
+
+RUN apt update && \
+      apt install -y procps smbclient libsmbclient-dev libmagickcore-6.q16-6-extra unrar-free p7zip p7zip-full \
+      nano cron curl ghostscript libldap2-dev iputils-ping && \
+      # Not supported yet python3-pip
+      apt autoclean && \
+      rm -rf /var/lib/apt/lists/*
+      # Because python3-pip not support, pip3 install youtube-dl can't execute command
+
+# Samba client php extension
+RUN pecl install smbclient
+RUN docker-php-ext-enable smbclient
+
+# Install php-ldap Extension
+RUN docker-php-ext-install ldap
+
+# inotify extension
+RUN pecl install inotify
+
+# For LibreSign preview image
+RUN sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' /etc/ImageMagick-6/policy.xml