diff --git a/.github/workflows/bin-release.yml b/.github/workflows/bin-release.yml
index 232bba5..f86deb6 100644
--- a/.github/workflows/bin-release.yml
+++ b/.github/workflows/bin-release.yml
@@ -20,6 +20,14 @@ jobs:
             goos: windows
     steps:
       - uses: actions/checkout@v4
+      - name: Get the tag name
+        id: get_tag_name
+        run: |
+          # Extract tag name and remove "v" if present
+          TAG_NAME="${GITHUB_REF#refs/tags/}"
+          VERSION="${TAG_NAME#v}"
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+          echo BUILD_TIME=$(date) >> ${GITHUB_ENV}
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -28,4 +36,6 @@ jobs:
           goversion: "https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz"
           project_path: "./"
           binary_name: "goma"
+          build_flags: -v
+          ldflags: -X "github.com/jkaninda/goma-gateway/util.Version=${{ env.VERSION }}" -X "github.com/jkaninda/goma-gateway/util.buildTime=${{ env.BUILD_TIME }}" -X github.com/jkaninda/goma-gateway/util.gitCommit=${{ github.sha }}
           #extra_files: LICENSE README.md
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fde875e..d8fa27c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,7 @@ jobs:
           TAG_NAME="${GITHUB_REF#refs/tags/}"
           VERSION="${TAG_NAME#v}"
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
+          echo BUILD_TIME=$(date) >> ${GITHUB_ENV}
       -
         name: Build and push
         uses: docker/build-push-action@v3
@@ -39,6 +40,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
             appVersion=${{ env.VERSION }}
+            buildTime=${{ env.BUILD_TIME }}
+            gitCommit=${{ github.sha }}
           tags: |
             "${{vars.BUILDKIT_IMAGE}}:${{ env.VERSION }}"
             "${{vars.BUILDKIT_IMAGE}}:latest"
diff --git a/Dockerfile b/Dockerfile
index 8a3801b..fc9ebee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,21 @@
 FROM golang:1.23.2 AS build
 WORKDIR /app
 ARG appVersion=""
+ARG buildTime=""
+ARG gitCommit=""
 # Copy the source code.
 COPY . .
 # Installs Go dependencies
 RUN go mod download
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'github.com/jkaninda/goma-gateway/util.Version=${appVersion}'" -o /app/goma
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'github.com/jkaninda/goma-gateway/util.Version=${appVersion}' -X 'github.com/jkaninda/goma-gateway/util.buildTime=${buildTime}'-X 'github.com/jkaninda/goma-gateway/util.gitCommit=${gitCommit}'" -o /app/goma
 
 FROM alpine:3.20.3
 ENV TZ=UTC
 ARG WORKDIR="/etc/goma/"
 ARG appVersion=""
 ARG user="goma"
-ENV VERSION=${appVersion}
 LABEL author="Jonas Kaninda"
 LABEL version=${appVersion}
 LABEL github="github.com/jkaninda/goma-gateway"