diff --git a/Makefile b/Makefile
index 67b96cfbb83..3bf5809b4e3 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ endif
 .PHONY: update-metadata
 update-metadata: build
 	@echo "Generating golang documentation metadata"
-	cd internal/server/config/generate && CGO_ENABLED=0 $(GO) build -o $(GOPATH)/bin/incus-doc
+	cd cmd/generate-config && CGO_ENABLED=0 $(GO) build -o $(GOPATH)/bin/incus-doc
 	$(GOPATH)/bin/incus-doc . --json ./internal/server/metadata/configuration.json --txt ./doc/config_options.txt
 
 .PHONY: doc-setup
diff --git a/internal/server/config/generate/README.md b/cmd/generate-config/README.md
similarity index 100%
rename from internal/server/config/generate/README.md
rename to cmd/generate-config/README.md
diff --git a/internal/server/config/generate/incus_doc.go b/cmd/generate-config/incus_doc.go
similarity index 100%
rename from internal/server/config/generate/incus_doc.go
rename to cmd/generate-config/incus_doc.go
diff --git a/internal/server/config/generate/incus_doc_test.go b/cmd/generate-config/incus_doc_test.go
similarity index 100%
rename from internal/server/config/generate/incus_doc_test.go
rename to cmd/generate-config/incus_doc_test.go
diff --git a/internal/server/config/generate/main.go b/cmd/generate-config/main.go
similarity index 100%
rename from internal/server/config/generate/main.go
rename to cmd/generate-config/main.go