diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index 4df8009b4..4a68b4f57 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -25,37 +25,3 @@ jobs:
           echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
       - name: release publish
         run: make release
-
-  goreleasermacm1:
-    runs-on: macos-latest
-    environment: release
-    env:
-      RA_TARGET: aarch64-apple-darwin
-      SELECT_XCODE: /Applications/Xcode_12.2.app
-
-    steps:
-      - name: Select XCode version
-        run: sudo xcode-select -s "${SELECT_XCODE}"
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: display sdk
-        run: SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)  && echo $SDKROOT  . " , " . $MACOSX_DEPLOYMENT_TARGET
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: '^1.16.4'
-      - name: release dry run
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: -f ./.goreleasermac.yml --rm-dist --skip-validate  --skip-publish   
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: setup release environment
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: release -f ./.goreleasermac.yml --rm-dist --skip-validate   
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 603b32b2b..b257aea69 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -15,7 +15,22 @@ builds:
     goarch:
       - amd64
     flags:
-        - -tags=cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
+        - -tags=testnet,cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
+    ldflags:
+      - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
+  - id: "chain-maind-darwin-arm64"
+    main: ./cmd/chain-maind
+    binary: bin/chain-maind
+    env:
+      - CGO_ENABLED=1
+      - CC=oa64-clang
+      - CXX=oa64-clang++
+    goos:
+      - darwin
+    goarch:
+      - arm64
+    flags:
+        - -tags=testnet,cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
     ldflags:
       - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
   - id: "chain-maind-linux"
@@ -30,7 +45,7 @@ builds:
     goarch:
       - amd64
     flags:
-      - -tags=cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
+      - -tags=testnet,cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
     ldflags:
       - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
   - id: "chain-maind-linux-arm64"
@@ -45,7 +60,7 @@ builds:
     goarch:
       - arm64
     flags:
-      - -tags=cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
+      - -tags=testnet,cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
     ldflags:
       - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
   - id: "chain-maind-windows"
@@ -60,7 +75,7 @@ builds:
     goarch:
       - amd64
     flags:
-      - -tags=cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
+      - -tags=testnet,cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
       - -buildmode=exe
     ldflags:
       - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
@@ -77,6 +92,7 @@ archives:
       format: zip
   builds:
   - chain-maind-darwin
+  - chain-maind-darwin-arm64
   - chain-maind-windows
   - chain-maind-linux
   - chain-maind-linux-arm64
diff --git a/.goreleasermac.yml b/.goreleasermac.yml
deleted file mode 100644
index 5873036d2..000000000
--- a/.goreleasermac.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-before:
-  hooks:
-  - go mod download
-
-builds:
-  - id: "chain-maind-darwin-arm64"
-    main: ./cmd/chain-maind
-    binary: bin/chain-maind
-    env:
-      - CGO_ENABLED=1
-      - SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk 
-      - MACOSX_DEPLOYMENT_TARGET=11.0
-    goos:
-      - darwin
-    goarch:
-      - arm64
-    flags:
-        - -tags=cgo,ledger,!test_ledger_mock,!ledger_mock,!ledger_zemu
-    ldflags:
-      - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=crypto-org-chain -X github.com/cosmos/cosmos-sdk/version.ServerName=chain-maind -X github.com/cosmos/cosmos-sdk/version.ClientName=chain-maincli -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}}
-  
-archives:
-- name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
-  replacements:
-    darwin: Darwin
-    amd64: x86_64
-  builds:
-  - chain-maind-darwin-arm64
-checksum:
-  name_template: 'checksumsmac.txt'
-
diff --git a/Makefile b/Makefile
index 285e03d6d..76e547fc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
 PACKAGE_NAME:=github.com/crypto-org-chain/chain-main
-GOLANG_CROSS_VERSION  = v1.16.4
+GOLANG_CROSS_VERSION  = v1.16.3
 
 
 VERSION := $(shell echo $(shell git describe --tags 2>/dev/null ) | sed 's/^v//')