diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 78898515..fbba45b3 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -74,6 +74,8 @@ jobs:
           platforms: ${{ matrix.os }}/${{ matrix.arch }}
           tags: xion:${{ matrix.os }}-${{ matrix.arch }}
           build-args: |
+            COMMIT=${{ github.sha }}
+            VERSION=${{ github.ref_name }}
             XIOND_BINARY=dist/xiond_${{ matrix.os }}_${{ matrix.arch }}/xiond
 
       - name: Build Heighliner Image
@@ -87,6 +89,8 @@ jobs:
           platforms: ${{ matrix.os }}/${{ matrix.arch }}
           tags: heighliner:${{ matrix.os }}-${{ matrix.arch }}
           build-args: |
+            COMMIT=${{ github.sha }}
+            VERSION=${{ github.ref_name }}
             XIOND_BINARY=dist/xiond_${{ matrix.os }}_${{ matrix.arch }}/xiond
 
       - name: Save Docker Image
diff --git a/Makefile b/Makefile
index 10f30eb2..9471789a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ DOCKER := $(shell which docker)
 GORELEASER_CROSS_IMAGE ?= goreleaser/goreleaser-cross
 GORELEASER_CROSS_VERSION ?= v1.22.7
 # need custom image
-GORELEASER_IMAGE ?= $(GORELEASER_CROSS_IMAGE) #goreleaser/goreleaser
-GORELEASER_VERSION ?= $(GORELEASER_CROSS_VERSION) #v2.3.2
+GORELEASER_IMAGE ?= $(GORELEASER_CROSS_IMAGE)
+GORELEASER_VERSION ?= $(GORELEASER_CROSS_VERSION)
 GORELEASER_RELEASE ?= false
 GORELEASER_SKIP_FLAGS ?= ""