diff --git a/Makefile b/Makefile
index 412df42..db3ca93 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@
 
 build: docker-build
 
-docker-build: go-junit-report gocover-cobertura golang golangci-lint hadolint protoc
+docker-build: go-junit-report gocover-cobertura golang golangci-lint hadolint protoc python
 
 go-junit-report:
 	${DOCKER} build ${DOCKER_BUILD_ARGS} \
@@ -91,6 +91,12 @@
 	-t ${IMAGENAME}:latest-golang \
 	-f docker/golang.Dockerfile .
 
+python:
+	${DOCKER} build ${DOCKER_BUILD_ARGS} \
+	-t ${IMAGENAME}:${VERSION}-python \
+	-t ${IMAGENAME}:latest-python \
+	-f docker/python.Dockerfile .
+
 golangci-lint:
 	${DOCKER} build ${DOCKER_BUILD_ARGS} \
 	--build-arg GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION} \
@@ -126,4 +132,5 @@
 	${DOCKER} push ${IMAGENAME}:${VERSION}-golangci-lint
 	${DOCKER} push ${IMAGENAME}:${VERSION}-hadolint
 	${DOCKER} push ${IMAGENAME}:${VERSION}-protoc
+	${DOCKER} push ${IMAGENAME}:${VERSION}-python
 
diff --git a/VERSION b/VERSION
index ccbccc3..276cbf9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3.0
diff --git a/docker/golang.Dockerfile b/docker/golang.Dockerfile
index e22bd8c..56a17e0 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.1-r0 && \
+RUN apk add --no-cache git=2.24.3-r0 && \
     mkdir -m 777 /.cache /go/pkg
 
 ENV GO111MODULE=on CGO_ENABLED=0
@@ -39,4 +39,4 @@
       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
\ No newline at end of file
+      org.opencord.golang-version=$GOLANG_VERSION
diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index a4ba885..a7526bc 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -19,7 +19,7 @@
 ARG PROTOC_GEN_GO_VERSION
 ARG PROTOC_GEN_GRPC_GATEWAY_VERSION
 
-RUN apk add --no-cache libatomic=9.2.0-r4 musl=1.1.24-r2
+RUN apk add --no-cache libatomic=9.3.0-r0 musl=1.1.24-r2
 
 # download & compile this specific version of protoc-gen-go
 RUN GO111MODULE=on CGO_ENABLED=0 go get -u \
diff --git a/docker/python.Dockerfile b/docker/python.Dockerfile
new file mode 100644
index 0000000..acec795
--- /dev/null
+++ b/docker/python.Dockerfile
@@ -0,0 +1,37 @@
+# Copyright 2020-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 python:3.8.5-alpine
+
+RUN pip install -I tox==3.19.0 && pip install -I bandit==1.6.2
+
+WORKDIR /app
+
+# 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
+
+LABEL org.label-schema.schema-version=1.0 \
+      org.label-schema.name=voltha-pythonci-lint \
+      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.python-version=3.8.5