diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
index f00cdd0..d18a015 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
@@ -2,7 +2,7 @@
 FROM ubuntu:14.04
 
 ### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
 LABEL Description="This image is used to get jacoco result from a jboss image" Version="1.0"
 
 ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
index b07c8c9..c279597 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
@@ -2,8 +2,8 @@
 
 
 ### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO base for arquillian" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO base for arquillian" Version="1.0"
 
 ENV CHEF_REPO_NAME="chef-repo"
 ENV CHEF_CONFIG_NAME="mso-config"
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
index ff7f44b..16d062e 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
@@ -2,8 +2,8 @@
 
 
 ### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO" Version="1.0"
 
 ARG http_proxy
 ARG https_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
index 2e8f268..8ed7107 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 ### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
 LABEL Description="This image contains an updated version of ubuntu 16.04" Version="1.0"
 
 ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10 b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
index fff7532..0e766e2 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
@@ -1,8 +1,8 @@
 FROM openecomp/ubuntu-update:1.0
 
 ### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains OpenECOMP MSO ubuntu base" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains ONAP SO ubuntu base" Version="1.0"
 
 ARG http_proxy
 ARG https_proxy