diff --git a/docker/debian-base.dockerfile b/docker/debian-base.dockerfile
index 2dd8dae99..77b7d37fe 100644
--- a/docker/debian-base.dockerfile
+++ b/docker/debian-base.dockerfile
@@ -2,8 +2,6 @@
 FROM node:20-bookworm-slim AS base2-slim
 ARG TARGETPLATFORM
 
-WORKDIR /app
-
 # Specify --no-install-recommends to skip unused dependencies, make the base much smaller!
 # apprise = for notifications (From testing repo)
 # sqlite3 = for debugging
@@ -44,13 +42,10 @@ COPY ./docker/etc/sudoers /etc/sudoers
 
 # Full Base Image
 # MariaDB, Chromium and fonts
-# Not working for armv7, so use the older version (10.5) of MariaDB from the debian repo
-# curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-11.1" && \
 FROM base2-slim AS base2
 ENV UPTIME_KUMA_ENABLE_EMBEDDED_MARIADB=1
 RUN apt update && \
     apt --yes --no-install-recommends install chromium fonts-indic fonts-noto fonts-noto-cjk mariadb-server && \
-    apt --yes remove curl && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove && \
     chown -R node:node /var/lib/mysql
diff --git a/docker/dockerfile b/docker/dockerfile
index 8c964750e..719cba5c5 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -21,6 +21,7 @@ COPY --chown=node:node package-lock.json package-lock.json
 RUN npm ci --omit=dev
 COPY . .
 COPY --chown=node:node --from=build_healthcheck /app/extra/healthcheck /app/extra/healthcheck
+RUN mkdir ./data
 
 ############################################
 # ⭐ Main Image
diff --git a/package.json b/package.json
index 9c548a51f..4814da6a7 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
         "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2 -t louislam/uptime-kuma:$VERSION --target release . --push",
         "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly2 --target nightly . --push",
         "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
-        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
+        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
         "setup": "git checkout 1.23.1 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",