diff --git a/Dockerfile b/Dockerfile
index 73e8789..9fb8159 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@
 ARG org_opencord_vcs_commit_date=unknown
 
 LABEL org.label-schema.schema-version=1.0 \
-      org.label-schema.name=voltha-ofagent \
+      org.label-schema.name=voltha-ofagent-py \
       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 \
diff --git a/Makefile b/Makefile
index 0055e40..709da9e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@
 DOCKER_REGISTRY            ?=
 DOCKER_REPOSITORY          ?=
 DOCKER_TAG                 ?= $(VERSION)$(shell [[ $(DOCKER_LABEL_VCS_DIRTY) == "true" ]] && echo "-dirty" || true)
-IMAGENAME                  := $(DOCKER_REGISTRY)$(DOCKER_REPOSITORY)voltha-ofagent:$(DOCKER_TAG)
+IMAGENAME                  := $(DOCKER_REGISTRY)$(DOCKER_REPOSITORY)voltha-ofagent-py:$(DOCKER_TAG)
 
 ## Docker labels. Only set ref and commit date if committed
 DOCKER_LABEL_VCS_URL       ?= $(shell git remote get-url $(shell git remote))
diff --git a/VERSION b/VERSION
index bda8fbe..5bc1cc4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.6
+2.2.7