diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index b970de5b25cb..42a1bf1a9792 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -18,14 +18,15 @@ jobs:
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Login do docker.io
-        run: docker login -u golangci -p ${{ secrets.GOLANGCI_LINT_DOCKER_TOKEN }}
-      - name: Create release
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}
+        run: docker login -u sayboras -p ${{ secrets.GOLANGCI_LINT_DOCKER_TOKEN }}
+#      - name: Create release
+#        uses: goreleaser/goreleaser-action@v2
+#        with:
+#          version: latest
+#          args: release --rm-dist
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}
+
       - name: Prepare
         id: prepare
         run: |
@@ -45,10 +46,14 @@ jobs:
           file: build/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
+          build-args: |
+            VERSION=${{ steps.prepare.outputs.tag_name }}
+            SHORT_COMMIT=${GITHUB_SHA::8}
+            DATE=$(date '+%Y-%m-%dT%H:%M:%SZ')
           tags: |
-            golangci/golangci-lint:${{ steps.prepare.outputs.tag_name }}
-            golangci/golangci-lint:${{ steps.prepare.outputs.major_tag }}
-            golangci/golangci-lint:latest
+            sayboras/golangci-lint:${{ steps.prepare.outputs.tag_name }}
+            sayboras/golangci-lint:${{ steps.prepare.outputs.major_tag }}
+            sayboras/golangci-lint:latest
       - name: build and publish alpine image
         id: docker_build_alpine
         uses: docker/build-push-action@v2
@@ -56,8 +61,12 @@ jobs:
           context: .
           file: build/Dockerfile.alpine
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            VERSION=${{ steps.prepare.outputs.tag_name }}
+            SHORT_COMMIT=${GITHUB_SHA::8}
+            DATE=$(date '+%Y-%m-%dT%H:%M:%SZ')
           push: true
           tags: |
-            golangci/golangci-lint:${{ steps.prepare.outputs.tag_name }}-alpine
-            golangci/golangci-lint:${{ steps.prepare.outputs.major_tag }}-alpine
-            golangci/golangci-lint:latest-alpine
+            sayboras/golangci-lint:${{ steps.prepare.outputs.tag_name }}-alpine
+            sayboras/golangci-lint:${{ steps.prepare.outputs.major_tag }}-alpine
+            sayboras/golangci-lint:latest-alpine
diff --git a/build/Dockerfile b/build/Dockerfile
index b9dc78c1d508..e4d858e4f9b2 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,9 +1,13 @@
 # stage 1 building the code
 FROM golang:1.15 as builder
 
+ARG VERSION
+ARG SHORT_COMMIT
+ARG DATE
+
 COPY / /golangci
 WORKDIR /golangci
-RUN go build -o golangci-lint ./cmd/golangci-lint/main.go
+RUN go build -s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE -o golangci-lint ./cmd/golangci-lint/main.go
 
 # stage 2
 FROM golang:1.15
diff --git a/build/Dockerfile.alpine b/build/Dockerfile.alpine
index 065c6596db6b..2e818718ec28 100644
--- a/build/Dockerfile.alpine
+++ b/build/Dockerfile.alpine
@@ -1,9 +1,13 @@
 # stage 1 building the code
 FROM golang:1.15-alpine as builder
 
+ARG VERSION
+ARG SHORT_COMMIT
+ARG DATE
+
 COPY / /golangci
 WORKDIR /golangci
-RUN CGO_ENABLED=0 go build -o golangci-lint ./cmd/golangci-lint/main.go
+RUN go build -s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE -o golangci-lint ./cmd/golangci-lint/main.go
 
 # stage 2
 FROM golang:1.15-alpine