diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0f95bb5..6eaec92 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,6 +7,9 @@ on:
 
 jobs:
   build-and-deploy:
+    env:
+      DOCKER_ORG: mibu-studio
+      DOCKER_LATEST: latest
     runs-on: docker
     steps:
       # - name: Checkout code
@@ -45,8 +48,8 @@ jobs:
             linux/arm64
           push: true
           tags: |
-            ${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            ${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
 
       - name: Trigger Dokploy Deployment
         run: |
diff --git a/Dockerfile b/Dockerfile
index 086c611..59f3428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
-# Build stage
-FROM node:lts-alpine AS build
+FROM node:lts AS build
 WORKDIR /app
-
-# Install dependencies first to leverage Docker cache
 COPY package*.json ./
 RUN npm ci --no-audit --no-fund --omit=dev && \
     npm cache clean --force
@@ -11,22 +8,7 @@ RUN npm ci --no-audit --no-fund --omit=dev && \
 COPY . .
 RUN npm run build
 
-# Runtime stage
-FROM httpd:2.4-alpine AS runtime
-
-# Copy custom httpd config if needed
-# COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
-
-# Copy built assets from build stage
-COPY --from=build /app/dist /usr/local/apache2/htdocs/
-
-# Add security headers
-# RUN echo 'Header set X-Content-Type-Options "nosniff"' >> /usr/local/apache2/conf/httpd.conf && \
-#     echo 'Header set X-Frame-Options "SAMEORIGIN"' >> /usr/local/apache2/conf/httpd.conf && \
-#     echo 'Header set X-XSS-Protection "1; mode=block"' >> /usr/local/apache2/conf/httpd.conf
-
-EXPOSE 80
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=3s \
-    CMD wget --quiet --tries=1 --spider http://localhost:80/ || exit 1
\ No newline at end of file
+FROM nginx:alpine AS runtime
+COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /app/dist /usr/share/nginx/html
+EXPOSE 80
\ No newline at end of file