diff --git a/.goreleaser.yml b/.goreleaser.yml
index a9a0ec9c7..2bc6ac6fe 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,33 +1,54 @@
-# all available options: https://goreleaser.com/customization/
-project_name: terraform-provider-okta
-
+# Visit https://goreleaser.com for documentation on how to customize this
+# behavior.
 before:
-  hooks: []
-
+  hooks:
+    # this is just an example and not a requirement for provider building/publishing
+    - go mod tidy
 builds:
-- binary: "terraform-provider-okta_v{{.Version}}_x4"
-  env:
-  - CGO_ENABLED=0
+- env:
+    # goreleaser does not work with CGO, it could also complicate
+    # usage by users in CI/CD systems like Terraform Cloud where
+    # they are unable to install libraries.
+    - CGO_ENABLED=0
+  mod_timestamp: '{{ .CommitTimestamp }}'
+  flags:
+    - -trimpath
+  ldflags:
+    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
   goos:
-  - darwin
-  - windows
-  - linux
+    - freebsd
+    - windows
+    - linux
+    - darwin
   goarch:
-  - amd64
-  ldflags: []
-
-archive:
-  # https://github.com/terraform-providers/terraform-provider-okta/issues/128#issuecomment-484565435
-  name_template: "{{.ProjectName}}-{{.Os}}-{{.Arch}}"
-  format_overrides:
-  - goos: windows
-    format: zip
-  - goos: darwin
-    format: zip
-  - goos: linux
-    format: zip
-  files:
-    - none*  # only package the binary - not defaults: readme, license, changelog
-
+    - amd64
+    - '386'
+    - arm
+    - arm64
+  ignore:
+    - goos: darwin
+      goarch: '386'
+  binary: '{{ .ProjectName }}_v{{ .Version }}'
+archives:
+- format: zip
+  name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
 checksum:
-  name_template: 'SHA256SUMS.txt'
+  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  algorithm: sha256
+signs:
+  - artifacts: checksum
+    args:
+      # if you are using this is a GitHub action or some other automated pipeline, you 
+      # need to pass the batch flag to indicate its not interactive.
+      - "--batch"
+      - "--local-user"
+      - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key
+      - "--output"
+      - "${signature}"
+      - "--detach-sign"
+      - "${artifact}"
+release:
+  # Visit your project's GitHub Releases page to publish this release.
+  draft: true
+changelog:
+  skip: true