diff --git a/Makefile b/Makefile
index 87a15f8..23fb8a5 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,12 @@
 	-t ${IMAGENAME}:latest-protoc \
 	-f docker/protoc.Dockerfile .
 
+onos-config-loader:
+	${DOCKER} build ${DOCKER_BUILD_ARGS} \
+	-t ${IMAGENAME}:${VERSION}-onos-config-loader \
+	-t ${IMAGENAME}:latest-onos-config-loader \
+	-f docker/onos-config-loader.Dockerfile .
+
 docker-push:
 ifneq (false,$(DOCKER_LABEL_VCS_DIRTY))
 	@echo "Local repo is dirty.  Refusing to push."
@@ -134,3 +140,4 @@
 	${DOCKER} push ${IMAGENAME}:${VERSION}-hadolint
 	${DOCKER} push ${IMAGENAME}:${VERSION}-protoc
 	${DOCKER} push ${IMAGENAME}:${VERSION}-python
+	${DOCKER} push ${IMAGENAME}:${VERSION}-onos-config-loader
diff --git a/VERSION b/VERSION
index 2bf1c1c..f90b1af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.1
+2.3.2
diff --git a/docker/golang.Dockerfile b/docker/golang.Dockerfile
index 56a17e0..0cfa9ec 100644
--- a/docker/golang.Dockerfile
+++ b/docker/golang.Dockerfile
@@ -15,7 +15,7 @@
 ARG GOLANG_VERSION
 FROM golang:$GOLANG_VERSION-alpine
 
-RUN apk add --no-cache git=2.24.3-r0 && \
+RUN apk add --no-cache git=2.24.4-r0 && \
     mkdir -m 777 /.cache /go/pkg
 
 ENV GO111MODULE=on CGO_ENABLED=0
diff --git a/docker/onos-config-loader.Dockerfile b/docker/onos-config-loader.Dockerfile
new file mode 100644
index 0000000..4065926
--- /dev/null
+++ b/docker/onos-config-loader.Dockerfile
@@ -0,0 +1,43 @@
+# Copyright 2021-present Open Networking Foundation
+#
+# 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.
+
+FROM alpine:3.8
+
+ENV KUBE_LATEST_VERSION="v1.20.4"
+
+RUN adduser -h voltha -s /sbin/nologin -u 1000 -D voltha \
+ && apk add --no-cache curl=7.61.1-r3 bash=4.4.19-r1 openssl=1.0.2u-r0 \
+ && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
+ && chmod +x /usr/local/bin/kubectl
+
+RUN bash --version
+
+# Label image
+ARG org_label_schema_version=unknown
+ARG org_label_schema_vcs_url=unknown
+ARG org_label_schema_vcs_ref=unknown
+ARG org_label_schema_build_date=unknown
+ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
+ARG GOLANG_VERSION=unknown
+
+LABEL org.label-schema.schema-version=1.0 \
+      org.label-schema.name=voltha-protoc \
+      org.label-schema.version=$org_label_schema_version \
+      org.label-schema.vcs-url=$org_label_schema_vcs_url \
+      org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
+      org.label-schema.build-date=$org_label_schema_build_date \
+      org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+      org.opencord.vcs-dirty=$org_opencord_vcs_dirty \
+      org.opencord.golang-version=$GOLANG_VERSION