diff --git a/.utilities/build.sh b/.utilities/build.sh
index 5ba3cdc..fc16faf 100644
--- a/.utilities/build.sh
+++ b/.utilities/build.sh
@@ -22,8 +22,8 @@ cd seafile-client/
 docker build \
     --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
     --build-arg VCS_REF=$(git rev-parse --short HEAD) \
-    --build-arg VERSION=$latest_version \
-    --build-arg PROJECT_URL=$CI_PROJECT_URL \
+    --build-arg CI_COMMIT_TAG \
+    --build-arg CI_PROJECT_URL \
     --tag $CI_PROJECT_NAME:build .
 
 docker save --output ../$CI_PROJECT_NAME.tar $CI_PROJECT_NAME:build
diff --git a/seafile-client/Dockerfile b/seafile-client/Dockerfile
index 2e466e6..eb8699e 100644
--- a/seafile-client/Dockerfile
+++ b/seafile-client/Dockerfile
@@ -23,11 +23,11 @@ LABEL maintainer="flow.gunso@gmail.com" \
     org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.name="Seafile Docker client" \
     org.label-schema.description="Sync Seafile librairies within Docker containers." \
-    org.label-schema.url=$PROJECT_URL \
+    org.label-schema.url=$CI_PROJECT_URL \
     org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url=$PROJECT_URL \
+    org.label-schema.vcs-url=$CI_PROJECT_URL \
     org.label-schema.vendor="flow.gunso@gmail.com" \
-    org.label-schema.version=$VERSION \
+    org.label-schema.version=$CI_COMMIT_TAG \
     org.label-schema.schema-version="1.0"
 
 # Install seaf-cli and oathtool, prepare the user.