diff --git a/.dockerignore b/.dockerignore
index 41afb66..cc722c7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
-node_modules
+**/node_modules
 .svelte-kit
 build
 dist
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 843dde3..8eb66ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,8 +55,11 @@ jobs:
       - name: Build containers
         run: docker compose -f docker-compose.yml -f docker-compose.prod.yml build
 
+#      - name: Add tag
+#        run: docker tag ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{env.TAG}}
+
       - name: Add tag
-        run: docker tag ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{env.TAG}}
+        run: docker tag ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{github.sha}}
 
       # - name: Tag with Git SHA
       #   run: docker tag ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{github.sha}}
diff --git a/Dockerfile b/Dockerfile
index b38690f..e5286f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,24 @@
-FROM node:18-alpine as pre-production
+FROM --platform=linux/amd64 node:18-alpine as pre-production
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
-COPY . .
+#COPY . .
 
-#COPY package.json .
-#COPY package-lock.json .
+COPY package.json .
+COPY package-lock.json .
+
+COPY backend/package.json ./backend/package.json
+COPY backend/package-lock.json ./backend/package-lock.json
 
 RUN npm i
 
-RUN npm run build
+RUN #npm ci --prefix backend --omit dev
+RUN npm ci --prefix backend
 
-RUN npm i --prefix backend
+COPY . .
+
+RUN npm run build
 
 RUN npm run build --prefix backend
 
@@ -24,12 +30,13 @@ WORKDIR /usr/src/app
 ENV NODE_ENV=production
 
 COPY --from=pre-production /usr/src/app/backend/dist ./dist
+COPY --from=pre-production /usr/src/app/backend/node_modules ./node_modules
 COPY --from=pre-production /usr/src/app/dist ./dist/dist
 
 COPY backend/package.json .
 COPY backend/package-lock.json .
 
-RUN npm ci --omit dev
+#RUN npm ci --omit dev
 
 RUN mkdir -p ./config
 
@@ -37,20 +44,20 @@ RUN ln -s /usr/src/app/config /config
 
 CMD [ "npm", "run", "start:prod" ]
 
-FROM node:18 as development
-
-ENV NODE_ENV=development
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-COPY package.json .
-COPY package-lock.json .
-
-RUN npm i
-
-RUN mkdir -p ./config
-
-RUN ln -s /usr/src/app/config /config
-
-CMD [ "npm", "run", "dev" ]
+#FROM node:18 as development
+#
+#ENV NODE_ENV=development
+#
+#RUN mkdir -p /usr/src/app
+#WORKDIR /usr/src/app
+#
+#COPY package.json .
+#COPY package-lock.json .
+#
+#RUN npm i
+#
+#RUN mkdir -p ./config
+#
+#RUN ln -s /usr/src/app/config /config
+#
+#CMD [ "npm", "run", "dev" ]