diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml
index 84209b8..4bb7093 100644
--- a/.github/workflows/docker:build&push.yaml
+++ b/.github/workflows/docker:build&push.yaml
@@ -24,6 +24,19 @@ jobs:
         -
             name: Set up Docker Buildx
             uses: docker/setup-buildx-action@v3
+        - 
+            name: Set date
+            id: date
+            run: echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
+        - 
+            name: Generate Docker metadata
+            id: meta
+            uses: docker/metadata-action@v5
+            with:
+                images: sergion14/uxcaptain-server
+                tags: |
+                    type=raw,value=${{ github.ref_name }}
+                    type=raw,value=${{ github.ref_name }}-${{ steps.date.outputs.date }}
         -
             name: Build and push
             uses: docker/build-push-action@v6
@@ -31,4 +44,4 @@ jobs:
                 context: .
                 platforms: linux/amd64 #,linux/arm64 - Not building for ARM, since ubuntu server is just amd64
                 push: true
-                tags: sergion14/uxcaptain:server-${{ github.ref_name }}
\ No newline at end of file
+                tags: ${{ steps.meta.outputs.tags }}
\ No newline at end of file
diff --git a/compose.yaml b/compose.yaml
index f18bdce..c033179 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -22,6 +22,9 @@ services:
   #     AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
   #     S3_BUCKET: dev-analysis-entry-storage
   #     S3_REGION: ${S3_REGION}
+  #     S3_ENDPOINT: ${S3_ENDPOINT}
+  #     MINIO_ROOT_USER=${MINIO_ROOT_USER}
+  #     MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
 
   #   ports:
   #     - 3000:3000