diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae4fbff301..9d02f204bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
           path: internal/embed/frontend
       - name: Set build info
         run: |
-          echo "VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0')" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo '0.0.0')" >> $GITHUB_ENV
           echo "BUILD_TIME=$(date -u '+%F %T UTC')" >> $GITHUB_ENV
           echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
           echo "GO_VERSION=$(go version | cut -d' ' -f3)" >> $GITHUB_ENV
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index e881eda82b..66a8f5c715 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -33,6 +33,13 @@ builds:
       - arm64
     ldflags:
       - -s -w --extldflags "-static"
+      - -X 'github.com/TheTNB/panel/internal/app.Version={{ .Version }}'
+      - -X 'github.com/TheTNB/panel/internal/app.BuildTime={{ .Now.Format "2006-01-02 15:04:05 MST" }}'
+      - -X 'github.com/TheTNB/panel/internal/app.CommitHash={{ .ShortCommit }}'
+      - -X 'github.com/TheTNB/panel/internal/app.GoVersion={{ .Env.GOVERSION }}'
+      - -X 'github.com/TheTNB/panel/internal/app.BuildID={{ .Env.GITHUB_RUN_ID }}'
+      - -X 'github.com/TheTNB/panel/internal/app.BuildUser={{ .Env.USER }}'
+      - -X 'github.com/TheTNB/panel/internal/app.BuildHost={{ .Env.HOSTNAME }}'
 
 upx:
   - enabled: true