diff --git a/cmd/plugin/builder/template/plugintemplates/main.go.tmpl b/cmd/plugin/builder/template/plugintemplates/main.go.tmpl
index 1cf38dd1d..8ab94dba6 100644
--- a/cmd/plugin/builder/template/plugintemplates/main.go.tmpl
+++ b/cmd/plugin/builder/template/plugintemplates/main.go.tmpl
@@ -12,7 +12,7 @@ import (
 var descriptor = plugin.PluginDescriptor{
 	Name:        "{{ .PluginName | ToLower }}",
 	Description: "{{ .Description | ToLower }}",
-	Target:      types.TargetUnknown,
+	Target:      "FIXME<<<", // set the Target of the plugin to types.(one of {TargetGlobal,TargetK8s,TargetTMC})
 	Version:     buildinfo.Version,
 	BuildSHA:    buildinfo.SHA,
 	Group:       plugin.ManageCmdGroup, // set group
diff --git a/cmd/plugin/builder/template/plugintemplates/plugin-tooling.mk.tmpl b/cmd/plugin/builder/template/plugintemplates/plugin-tooling.mk.tmpl
index 42017a025..4e8dd5d31 100644
--- a/cmd/plugin/builder/template/plugintemplates/plugin-tooling.mk.tmpl
+++ b/cmd/plugin/builder/template/plugintemplates/plugin-tooling.mk.tmpl
@@ -16,7 +16,7 @@ endif
 
 PLUGIN_BUILD_SHA ?= $(shell git describe --match=$(git rev-parse --short HEAD) --always --dirty)
 PLUGIN_BUILD_DATE ?= $(shell date -u +"%Y-%m-%d")
-PLUGIN_BUILD_VERSION ?= $(shell git describe --tags 2>$(NUL))
+PLUGIN_BUILD_VERSION ?= $(shell git describe --tags --abbrev=0 2>$(NUL))
 
 ifeq ($(strip $(PLUGIN_BUILD_VERSION)),)
 PLUGIN_BUILD_VERSION = v0.0.0
@@ -46,7 +46,7 @@ TZBIN ?= tanzu
 BUILDER_PLUGIN ?= $(TZBIN) builder
 PUBLISHER ?= tzcli
 VENDOR ?= vmware
-PLUGIN_PUBLISH_REPOSITORY ?= localhost:$(REGISTRY_PORT)/test/v1/tanzu-cli/plugins
+PLUGIN_PUBLISH_REPOSITORY ?= $(REGISTRY_ENDPOINT)/test/v1/tanzu-cli/plugins
 PLUGIN_INVENTORY_IMAGE_TAG ?= latest
 
 PLUGIN_SCOPE_ASSOCIATION_FILE ?= ""
diff --git a/cmd/plugin/builder/template/root.go b/cmd/plugin/builder/template/root.go
index d6ee945f8..5fb1ac825 100644
--- a/cmd/plugin/builder/template/root.go
+++ b/cmd/plugin/builder/template/root.go
@@ -59,10 +59,9 @@ var PluginToolingMK = Target{
 }
 
 // Codeowners target
-// TODO (pbarker): replace with the CLI reviewers group
 var Codeowners = Target{
 	Filepath: "CODEOWNERS",
-	Template: `* @vuil`,
+	Template: `* # edit as appropriate`,
 }
 
 // Tools target.
diff --git a/plugin-tooling.mk b/plugin-tooling.mk
index 5bc5f64fc..19be22a7f 100644
--- a/plugin-tooling.mk
+++ b/plugin-tooling.mk
@@ -16,7 +16,7 @@ endif
 
 PLUGIN_BUILD_SHA ?= $(shell git describe --match=$(git rev-parse --short HEAD) --always --dirty)
 PLUGIN_BUILD_DATE ?= $(shell date -u +"%Y-%m-%d")
-PLUGIN_BUILD_VERSION ?= $(shell git describe --tags 2>$(NUL))
+PLUGIN_BUILD_VERSION ?= $(shell git describe --tags --abbrev=0 2>$(NUL))
 
 ifeq ($(strip $(PLUGIN_BUILD_VERSION)),)
 PLUGIN_BUILD_VERSION = v0.0.0
@@ -45,7 +45,7 @@ PLUGIN_NAME ?= *
 BUILDER_PLUGIN ?= $(ROOT_DIR)/bin/builder
 PUBLISHER ?= tzcli
 VENDOR ?= vmware
-PLUGIN_PUBLISH_REPOSITORY ?= localhost:$(REGISTRY_PORT)/test/v1/tanzu-cli/plugins
+PLUGIN_PUBLISH_REPOSITORY ?= $(REGISTRY_ENDPOINT)/test/v1/tanzu-cli/plugins
 PLUGIN_INVENTORY_IMAGE_TAG ?= latest
 
 PLUGIN_SCOPE_ASSOCIATION_FILE ?= $(PLUGIN_DIR)/plugin-scope-association.yaml