diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index bf4c2a42..64f4a952 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v5
         with:
-          context: ./release
+          context: ./
           file: ./Dockerfile.build
           push: true
           tags: k2.xuthus83.cn:6001/pigallery2:latest
\ No newline at end of file
diff --git a/Dockerfile.build b/Dockerfile.build
new file mode 100644
index 00000000..e8c809ad
--- /dev/null
+++ b/Dockerfile.build
@@ -0,0 +1,44 @@
+#-----------------BUILDER-----------------
+#-----------------------------------------
+FROM node:18.19-bullseye AS builder
+RUN apt update && apt install -y --no-install-recommends libvips-dev python3
+COPY pigallery2-release /app
+WORKDIR /app
+RUN npm install --unsafe-perm --fetch-timeout=90000
+RUN mkdir -p /app/data/config && \
+    mkdir -p /app/data/db && \
+    mkdir -p /app/data/images && \
+    mkdir -p /app/data/tmp
+
+
+#-----------------MAIN--------------------
+#-----------------------------------------
+FROM node:18-bullseye-slim AS main
+WORKDIR /app
+ENV NODE_ENV=production \
+    # overrides only the default value of the settings (the actualy value can be overwritten through config.json)
+    default-Database-dbFolder=/app/data/db \
+    default-Media-folder=/app/data/images \
+    default-Media-tempFolder=/app/data/tmp \
+    default-Extensions-folder=/app/data/config/extensions \
+    # flagging dockerized environemnt
+    PI_DOCKER=true
+
+EXPOSE 80
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates wget ffmpeg libvips42 \
+    && apt-get clean -q -y \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /app /app
+VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
+
+# Run build time diagnostics to make sure the app would work after build is finished
+RUN ["node", "./src/backend/index", "--expose-gc",  "--run-diagnostics", "--config-path=/app/diagnostics-config.json"]
+HEALTHCHECK --interval=40s --timeout=30s --retries=3 --start-period=60s \
+  CMD wget --quiet --tries=1 --no-check-certificate --spider \
+  http://localhost:80/heartbeat || exit 1
+
+# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
+# Exec form entrypoint is need otherwise (using shell form) ENV variables are not properly passed down to the app
+ENTRYPOINT ["node", "./src/backend/index", "--expose-gc",  "--config-path=/app/data/config/config.json"]
+