diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 6ce75ec..7608e3e 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -9,6 +9,11 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
+  TAGS: |
+    type=sha,prefix=,suffix=-{{date 'X'}}
+    type=raw,enable=${{ !startsWith(github.ref, 'refs/tags/') }},value=develop
+    type=semver,pattern={{raw}}
+  
 
 jobs:
   ghcr:
@@ -31,8 +36,8 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
+      - name: Extract frontend metadata
+        id: meta-front
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend
@@ -41,18 +46,28 @@ jobs:
             type=raw,enable=${{ !startsWith(github.ref, 'refs/tags/') }},value=develop
             type=semver,pattern={{raw}}
             
+      - name: Extract backend metadata
+        id: meta-back
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend
+          tags: |
+            type=sha,prefix=,suffix=-{{date 'X'}}
+            type=raw,enable=${{ !startsWith(github.ref, 'refs/tags/') }},value=develop
+            type=semver,pattern={{raw}}
+            
       - name: Build and push frontend Docker image
         uses: docker/build-push-action@v5
         with:
           context: ./frontend
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          
-      # - name: Build and push backend Docker image
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     context: ./backend
-      #     push: true
-      #     tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/backend:${{ steps.meta.outputs.tags }}
-      #     labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta-front.outputs.labels }}
+            
+      - name: Build and push backend Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./backend
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta-back.outputs.labels }}
\ No newline at end of file