diff --git a/.goreleaser.yml b/.goreleaser.yml
index ef84f99ccb..e2b66ecf4c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -106,22 +106,23 @@ changelog:
       regexp: '^.*?BREAKING CHANGE(\([[:word:]]+\))??!?:.+$'
       order: 0
     - title: Features
-      regexp: '^.*?feat(\([[:word:]]+\))??!?:.+$'
+      regexp: '^.*?feat(\([^)]*\))?!?:.+$'
       order: 1
     - title: 'Bug Fixes'
-      regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
+      regexp: '^.*?fix(\([^)]*\))?!?:.+$'
       order: 2
     - title: 'Build, CI'
-      regexp: '^.*?(ci|build)(\([[:word:]]+\))??!?:.+$'
+      regexp: '^.*?(ci|build)(\([^)]*\))?!?:.+$'
       order: 3
-    - title: 'Document Updates'
-      regexp: '^.*?docs(\([[:word:]]+\))??!?:.+$'
-      order: 4
     - title: Improvements
-      regexp: '^.*?(test|refactor|perf)(\([[:word:]]+\))??!?:.+$'
+      regexp: '^.*?(test|refactor|perf)(\([^)]*\))?!?:.+$'
+      order: 4
+    - title: 'Document Updates'
+      regexp: '^.*?docs(\([^)]*\))?!?:.+$'
       order: 5
     - title: Others
-      order: 999
+      regexp: '^.*?(chore|style|revert)(\([^)]*\))?!?:.+$'
+      order: 6
 
 release:
   github:
diff --git a/Makefile b/Makefile
index 3202d40aa9..c32a0279cc 100644
--- a/Makefile
+++ b/Makefile
@@ -542,14 +542,13 @@ release:
 		-e GITHUB_TOKEN="$(GITHUB_TOKEN)" \
 		--platform linux/amd64 \
 		-e GITHUB_TOKEN=$(GITHUB_TOKEN) \
-		-e OST_VERSION=$(OST_VERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
 		$(GORELEASER_IMAGE) \
 		release \
 		--clean \
-		--skip=announce \
+		--skip=announce
 else
 release:
 	@echo "Error: GITHUB_TOKEN is not defined. Please define it before running 'make release'."
@@ -566,7 +565,7 @@ release-dry-run:
 		$(GORELEASER_IMAGE) \
 		release \
 		--clean \
-		--skip=validate --skip=publish --skip=announce \
+		--skip=publish --skip=announce --skip=validate \
 		--verbose
 
 release-snapshot:
@@ -580,7 +579,6 @@ release-snapshot:
 		$(GORELEASER_IMAGE) \
 		release \
 		--clean \
-		--snapshot \
-		--skip=publish --skip=announce
+		--snapshot
 
 .PHONY: release release-dry-run release-snapshot