diff --git a/Makefile b/Makefile
index 371815e..e0a19a1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,18 +18,22 @@ ALL_SRC         := $(shell find . -name "*.go")
 ALL_SRC         += go.mod
 
 all: bins fmt lint
-bins: s2s-proxy
+bins: s2s-proxy configconverter
 clean:  clean-bins clean-tests
 
 clean-bins:
 	@printf $(COLOR) "Delete old binaries...\n"
 	@rm -f ./bins/*
 
-# Binary target
+# Binary targets
 s2s-proxy: $(ALL_SRC)
 	@printf $(COLOR) "Build s2s-proxy with CGO_ENABLED=$(CGO_ENABLED) for $(GOOS)/$(GOARCH)...\n"
 	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=$(CGO_ENABLED) go build -o ./bins/s2s-proxy ./cmd/proxy
 
+configconverter: $(ALL_SRC)
+	@printf $(COLOR) "Build configconverter with CGO_ENABLED=$(CGO_ENABLED) for $(GOOS)/$(GOARCH)...\n"
+	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=$(CGO_ENABLED) go build -o ./bins/configconverter ./cmd/tools/configconverter
+
 update-tools:
 # When changing the golangci-lint version, update the version in .github/workflows/pull-request.yml
 	$(GO_GET_TOOL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.8