diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3e6d54..f68f0c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optimize config template and config file.
 - Optimize pubkeys authentication.
 - Optimize some flags description.
+- Optimize Makefile.
 
 ## [1.15.0]
 
diff --git a/Makefile b/Makefile
index 41c78e9..f208098 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ define USAGE_OPTIONS
 Options:
 
    PLATFORMS   The multiple platforms to build.
-               Default is 'darwin_amd64 darwin_arm64 linux_amd64 linux_arm64 windows_amd64'.
+               Default is 'darwin_amd64 darwin_arm64 linux_amd64 linux_arm64'.
                This option is available when using: make build.multiarch.
                Example: make build.multiarch PLATFORMS="linux_amd64"
 endef
diff --git a/pkg/inventory/inventory_test.go b/pkg/inventory/inventory_test.go
index 0767ce0..d843c79 100644
--- a/pkg/inventory/inventory_test.go
+++ b/pkg/inventory/inventory_test.go
@@ -48,7 +48,6 @@ func TestGetAllHosts(t *testing.T) {
 					Password: "123456",
 					Keys: []string{
 						"~/.ssh/id_rsa",
-						"~/.ssh/id_ecdsa",
 					},
 					Passphrase: "xxx",
 				},
@@ -122,7 +121,6 @@ func TestGetHostsByGroup(t *testing.T) {
 					Password: "123456",
 					Keys: []string{
 						"~/.ssh/id_rsa",
-						"~/.ssh/id_ecdsa",
 					},
 					Passphrase: "xxx",
 				},
diff --git a/scripts/makefiles/go.makefile b/scripts/makefiles/go.makefile
index f765561..f8b772b 100644
--- a/scripts/makefiles/go.makefile
+++ b/scripts/makefiles/go.makefile
@@ -50,9 +50,9 @@ go.build.%:
 	$(eval ARCH := $(word 2,$(subst _, ,${PLATFORM})))
 	$(eval GO_BIN_EXT = $(if $(findstring windows,${OS}),.exe,))
 	@echo "==========> Building binary '${COMMAND}${GO_BIN_EXT}' ${VERSION} for ${OS} ${ARCH}"
-	@mkdir -p ${OUTPUT_DIR}/platforms/${OS}/${ARCH}
-	@CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} ${GO} build ${GO_BUILD_FLAGS} -o ${OUTPUT_DIR}/platforms/${OS}/${ARCH}/${COMMAND}${GO_BIN_EXT} ${ROOT_PACKAGE}/cmd/${COMMAND}
-	@echo "${OUTPUT_DIR}/platforms/${OS}/${ARCH}/${COMMAND}${GO_BIN_EXT}"
+	@mkdir -p ${OUTPUT_DIR}/bins
+	@CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} ${GO} build ${GO_BUILD_FLAGS} -o ${OUTPUT_DIR}/bins/${COMMAND}${GO_BIN_EXT}-${VERSION}-${OS}-${ARCH} ${ROOT_PACKAGE}/cmd/${COMMAND}
+	@echo "${OUTPUT_DIR}/bins/${COMMAND}${GO_BIN_EXT}-${VERSION}-${OS}-${ARCH}"
 
 .PHONY: go.build
 go.build: go.tidy $(addprefix go.build., $(addprefix ${PLATFORM}., ${BINS}))
@@ -98,7 +98,7 @@ go.install.%:
 	$(eval ARCH := $(word 2,$(subst _, ,${PLATFORM})))
 	$(eval GO_BIN_EXT = $(if $(findstring windows,${OS}),.exe,))
 	@echo "==========> Install binary '${COMMAND}${GO_BIN_EXT}' ${VERSION} for ${OS} ${ARCH}"
-	cp ${OUTPUT_DIR}/platforms/${OS}/${ARCH}/${COMMAND}${GO_BIN_EXT} /usr/local/bin/
+	cp ${OUTPUT_DIR}/bins/${COMMAND}${GO_BIN_EXT}-${VERSION}-${OS}-${ARCH} /usr/local/bin/gossh
 
 .PHONY: go.install
 go.install: $(addprefix go.install., $(addprefix ${PLATFORM}., ${BINS})) 
diff --git a/scripts/makefiles/share.makefile b/scripts/makefiles/share.makefile
index 3d750b7..6fac803 100644
--- a/scripts/makefiles/share.makefile
+++ b/scripts/makefiles/share.makefile
@@ -47,7 +47,7 @@ ifeq ($(origin COVERAGE), undefined)
 endif
 
 # The OS can be linux/windows/darwin when building binaries.
-PLATFORMS ?= darwin_amd64 darwin_arm64 linux_amd64 linux_arm64 windows_amd64
+PLATFORMS ?= darwin_amd64 darwin_arm64 linux_amd64 linux_arm64
 
 # Set a specific platform.
 ifeq ($(origin PLATFORM), undefined)