diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml
index c8bfe2f4..9ac8ea13 100644
--- a/.github/workflows/publish-container.yml
+++ b/.github/workflows/publish-container.yml
@@ -87,8 +87,8 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           images: |
-            name=ghcr.io/${{env.USER}}/${{matrix.path}},enable=true
-            name=docker.io/${{env.USER}}/${{matrix.path}},enable=true
+            name=ghcr.io/${{env.USER}}/storage-${{matrix.path}},enable=true
+            name=docker.io/${{env.USER}}/storage-${{matrix.path}},enable=true
           tags: |
             type=semver,enable=true,pattern={{major}}
             type=semver,enable=true,pattern={{major}}.{{minor}}
@@ -97,6 +97,8 @@ jobs:
           labels: |
             org.opencontainers.image.title="alwatr/storage-${{matrix.path}}"
             org.opencontainers.image.vendor="Alwatr"
+            org.opencontainers.image.documentation="https://github.com/Alwatr/storage"
+            org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com)"
 
       - name: 🚀 Build and push container image
         if: ${{ steps.file_change.outputs.container_folder != 'false' }}
@@ -109,9 +111,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-          build-args: |
-            BUILD_DATE=${{github.event.repository.updated_at}}
-            BUILD_REV=${{github.sha}}
 
       # - name: 🏗 Sign the image with GitHub OIDC Token
       #   if: ${{ github.event_name != 'pull_request' && steps.file_change.outputs.container_folder != 'false' }}
diff --git a/packages/nginx/Dockerfile b/packages/nginx/Dockerfile
index dfbbd1a6..f82c5fa0 100644
--- a/packages/nginx/Dockerfile
+++ b/packages/nginx/Dockerfile
@@ -15,18 +15,5 @@ ENV NGINX_OPEN_FILE_CACHE="max=5000 inactive=1h" \
     NGINX_LIMIT_REQ_BURST=1000 \
     NGINX_DISABLE_SYMLINKS=if_not_owner
 
-ARG BUILD_REV
-ARG BUILD_DATE
-# LABEL org.opencontainers.image.title="alwatr/storage-nginx" \
-#       org.opencontainers.image.description="Serve the content of the Alwatr Storage database extremely quickly with validating the authentication token." \
-#       org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-json:2.0.0" \
-#       org.opencontainers.image.version="4.0.0" \
-#       org.opencontainers.image.ref.name="2.0.0-nginx1.25.3-alpine3.18-slim" \
-#       org.opencontainers.image.licenses="MIT" \
-#       org.opencontainers.image.created=${BUILD_DATE} \
-#       org.opencontainers.image.revision=${BUILD_REV} \
-#       org.opencontainers.image.vendor="Alwatr" \
-#       org.opencontainers.image.source="https://github.com/Alwatr/storage" \
-#       org.opencontainers.image.url="https://github.com/Alwatr/storage" \
-#       org.opencontainers.image.documentation="https://github.com/Alwatr/storage" \
-#       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)"
+LABEL org.opencontainers.image.base.name="ghcr.io/alwatr/nginx-json:2.0.0" \
+      org.opencontainers.image.documentation="https://github.com/Alwatr/storage" \