diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index da774d9..f3d3711 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -18,10 +18,11 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
       - name: Generate CHANGELOG.md
         run: |
-          GO111MODULE=off go get -u github.com/git-chglog/git-chglog/cmd/git-chglog
+          cd; GO111MODULE=on go get -u github.com/git-chglog/git-chglog/cmd/git-chglog
+          cd $GITHUB_WORKSPACE
           git-chglog --config .ci/git-chglog.yml --output=CHANGELOG.md $(git describe --tags $(git rev-list --tags --max-count=1))
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
diff --git a/.goreleaser.yml b/.goreleaser.yml
index a1f3695..bf26aaa 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,22 +1,27 @@
+archives:
+- format_overrides:
+  - goos: windows
+    format: zip
+
 before:
   hooks:
-    - make clean
+  - make clean
 
 builds:
 - env:
-    - CGO_ENABLED=0
+  - CGO_ENABLED=0
   ldflags:
-    - -s -w
-    - -X github.com/groupe-edf/watchdog/internal/version.Version={{.Tag}}
-    - -X github.com/groupe-edf/watchdog/internal/version.BuildDate={{.Date}}
-    - -X github.com/groupe-edf/watchdog/internal/version.Commit={{.FullCommit}}
-    - -X github.com/groupe-edf/watchdog/internal/version.Sha={{.ShortCommit}}
+  - -s -w
+  - -X github.com/groupe-edf/watchdog/internal/version.Version={{.Tag}}
+  - -X github.com/groupe-edf/watchdog/internal/version.BuildDate={{.Date}}
+  - -X github.com/groupe-edf/watchdog/internal/version.Commit={{.FullCommit}}
+  - -X github.com/groupe-edf/watchdog/internal/version.Sha={{.ShortCommit}}
   goos:
-    - darwin
-    - linux
-    - windows
+  - darwin
+  - linux
+  - windows
   goarch:
-    - amd64
+  - amd64
   mod_timestamp: "{{ .CommitTimestamp }}"
 
 changelog:
@@ -28,17 +33,17 @@ checksum:
 dist: target
 
 nfpms:
-  - homepage: https://github.com/groupe-edf/watchdog
-    maintainer: Habib MAALEM <habib.maalem@gmail.com>
-    description: Git server-side Custom Hooks
-    vendor: watchdog
-    license: GPL
-    formats:
-      - apk
-      - deb
-      - rpm
-    empty_folders:
-    - /var/log/watchdog
+- homepage: https://github.com/groupe-edf/watchdog
+  maintainer: Habib MAALEM <habib.maalem@gmail.com>
+  description: Git server-side Custom Hooks
+  vendor: watchdog
+  license: GPL
+  formats:
+  - apk
+  - deb
+  - rpm
+  empty_folders:
+  - /var/log/watchdog
 
 project_name: watchdog