diff --git a/.circleci/config.yml b/.circleci/config.yml
index 371309d..6f00899 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,18 +6,12 @@ jobs:
   build:
     docker:
       # specify the version
-      - image: circleci/golang:1.15.6-buster
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
+      - image: cimg/go:1.18.1
 
     #### TEMPLATE_NOTE: go expects specific checkout path representing url
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
     steps:
       - checkout
 
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 6419ba1..1a952a0 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -8,21 +8,32 @@ builds:
       - linux
       - windows
       - darwin
+      - freebsd
+      - netbsd
+      - openbsd
     goarch:
       - 386
       - amd64
       - arm64
+    goarm:
+      - 6
+      - 7
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: windows
-        goarch: arm64
+#      - goos: windows
+#        goarch: arm64
 archives:
-- files:
-  - mqttcli_*
+  - format: binary
+    name_template: '{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    files:
+      - mqttcli_*
+    format_overrides:
+      - goos: windows
+        format: zip
 changelog:
   sort: asc
   filters:
     exclude:
       - '^docs:'
-      - '^test:'
\ No newline at end of file
+      - '^test:'