diff --git a/.goreleaser.yml b/.goreleaser.yml
index 7126f0b08..f4ad9aafc 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -27,34 +27,17 @@ builds:
       - -s
       - -w
       - -X github.com/checkmarx/ast-cli/internal/params.Version={{.Version}}
-
-  - main: ./cmd/main.go
-    env:
-      - CGO_ENABLED=0
-    binary: cx
-    id: cx-mac-arm
-    goos:
-      - darwin
-    goarch:
-      - arm64
-    hooks:
-      post: gon gonArm.hcl
-    ldflags:
-      - -s
-      - -w
-      - -X github.com/checkmarx/ast-cli/internal/params.Version={{.Version}}
-
   - main: ./cmd/main.go
     env:
       - CGO_ENABLED=0
     binary: cx
-    id: cx-mac-amd
+    id: cx-mac-universal
     goos:
       - darwin
     goarch:
       - amd64
-    hooks:
-      post: gon gonAmd.hcl
+      - arm
+      - arm64
     ldflags:
       - -s
       - -w
@@ -81,20 +64,20 @@ archives:
       386: x32
     files:
       - LICENSE
-  - id: cx-mac-arm-archive
-    builds:
-      - cx-mac-arm
-    files:
-      - LICENSE
-      - ./dist/cx-mac-arm_darwin_arm64/cx.dmg
-  - id: cx-mac-amd-archive
+  - id: cx-mac-universal
     builds:
-      - cx-mac-amd
-    replacements:
-      amd64: x64
+      - cx-mac-universal
     files:
       - LICENSE
-      - ./dist/cx-mac-amd_darwin_amd64/cx.dmg
+      - ./dist/cx-mac-universal_darwin_all/cx.dmg
+    name_template: "{{ .ProjectName }}_{{ .Version }}_darwin_x64"
+
+universal_binaries:
+  - id: cx-mac-universal
+    replace: true
+    name_template: "cx"
+    hooks:
+      post: gon gonMac.hcl
 
 brews:
   - tap:
diff --git a/gonArm.hcl b/gonArm.hcl
deleted file mode 100644
index 3ed5ab4e3..000000000
--- a/gonArm.hcl
+++ /dev/null
@@ -1,17 +0,0 @@
-# gonArm.hcl
-source = ["./dist/cx-mac-arm_darwin_arm64/cx"]
-bundle_id = "com.checkmarx.cli"
-
-apple_id {
-  username = "tiago.baptista@checkmarx.com"
-  password = "@env:AC_PASSWORD"
-}
-
-sign {
-  application_identity = "Developer ID Application: CHECKMARX LTD (Z68SAQG5BR)"
-}
-
-dmg {
-  output_path = "./dist/cx-mac-arm_darwin_arm64/cx.dmg"
-  volume_name = "cx"
-}
diff --git a/gonAmd.hcl b/gonMac.hcl
similarity index 69%
rename from gonAmd.hcl
rename to gonMac.hcl
index 26607ae29..4ce752ebf 100644
--- a/gonAmd.hcl
+++ b/gonMac.hcl
@@ -1,5 +1,5 @@
 # gonArm.hcl
-source = ["./dist/cx-mac-amd_darwin_amd64/cx"]
+source = ["./dist/cx-mac-universal_darwin_all/cx"]
 bundle_id = "com.checkmarx.cli"
 
 apple_id {
@@ -12,6 +12,6 @@ sign {
 }
 
 dmg {
-  output_path = "./dist/cx-mac-amd_darwin_amd64/cx.dmg"
+  output_path = "./dist/cx-mac-universal_darwin_all/cx.dmg"
   volume_name = "cx"
 }