diff --git a/makefiles/golang/include.mk b/makefiles/golang/include.mk
new file mode 100644
index 0000000..7ce9b66
--- /dev/null
+++ b/makefiles/golang/include.mk
@@ -0,0 +1,26 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2023-2024 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2024 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# ONF.makefiles.include.version = 1.1
+# -----------------------------------------------------------------------
+
+include $(ONF_MAKEDIR)/golang/mod-update.mk
+
+# [EOF]
diff --git a/makefiles/golang/mod-update.mk b/makefiles/golang/mod-update.mk
new file mode 100644
index 0000000..7440142
--- /dev/null
+++ b/makefiles/golang/mod-update.mk
@@ -0,0 +1,77 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2024 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+.PHONY: mod-update
+mod-update: mod-tidy mod-vendor
+
+## -----------------------------------------------------------------------
+## Intent: Invoke the golang mod tidy command
+## -----------------------------------------------------------------------
+.PHONY: mod-tidy
+mod-tidy :
+	$(call banner-enter,Target $@)
+	$(if $(LOCAL_FIX_PERMS),chmod o+w $(CURDIR))
+	${GO} mod tidy
+	$(if $(LOCAL_FIX_PERMS),chmod o-w $(CURDIR))
+	$(call banner-leave,Target $@)
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+.PHONY: mod-vendor
+mod-vendor : mod-tidy
+mod-vendor :
+	$(call banner-enter,Target $@)
+	$(if $(LOCAL_FIX_PERMS),chmod o+w $(CURDIR))
+	${GO} mod vendor
+	$(if $(LOCAL_FIX_PERMS),chmod o-w $(CURDIR))
+	$(call banner-leave,Target $@)
+
+## -----------------------------------------------------------------------
+## Intent: Display topic help
+## Usage:
+##   % make help
+## -----------------------------------------------------------------------
+help-summary ::
+	@printf '  %-30s %s\n' 'mod-update' \
+	  'Alias for make mod-tidy mod-update (GOLANG)'
+  ifdef VERBOSE
+	@$(MAKE) --no-print-directory mod-update-help
+  endif
+
+## -----------------------------------------------------------------------
+## Intent: Display extended topic help
+## Usage:
+##   % make mod-update-help
+##   % make help VERBOSE=1
+## -----------------------------------------------------------------------
+.PHONY: mod-update-help
+mod-update-help ::
+	@printf '  %-30s %s\n' 'mod-tidy'\
+	  'Invoke go mod tidy'
+	@printf '  %-30s %s\n' 'mod-vendor'\
+	  'Invoke go mod vendor'
+	@echo
+	@echo '[MODIFIER]'
+	@printf '  %-30s %s\n' 'LOCAL_FIX_PERMS=1' \
+	  'Local dev hack to fix docker uid/gid volume problem'
+
+# [EOF]
diff --git a/makefiles/include.mk b/makefiles/include.mk
index fcb57fd..1bea64e 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -71,7 +71,8 @@
 ##------------------------------------##
 ##---]  Languages & Interpreters  [---##
 ##------------------------------------##
-# include $(ONF_MAKEDIR)/src/golang/mod-update.mk
+# [TODO] $(if $(golang-mode),$(eval include))
+include $(ONF_MAKEDIR)/golang/include.mk
 
 ##---------------------##
 ##---]  ON_DEMAND  [---##
diff --git a/makefiles/targets/sterile.mk b/makefiles/targets/sterile.mk
index f5922ee..790d929 100644
--- a/makefiles/targets/sterile.mk
+++ b/makefiles/targets/sterile.mk
@@ -27,7 +27,7 @@
 ##         persistent content.  For ex removal of a python virtualenv adds
 ##         extra overhead to development iteration:
 ##           make clean   - preserve a virtual env
-##           make sterile - force reinstallation
+##           make sterile - force re-installation
 ## -----------------------------------------------------------------------
 .PHONY: sterile
 sterile :: clean