diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index e087e0f..a2dda2d 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -14,9 +14,7 @@
 
 FROM ubuntu:xenial
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Update to have latest images
 RUN apt-get update && \
diff --git a/docker/Dockerfile.base.alpine b/docker/Dockerfile.base.alpine
index 8d04cb1..0ea2bdf 100644
--- a/docker/Dockerfile.base.alpine
+++ b/docker/Dockerfile.base.alpine
@@ -14,9 +14,7 @@
 
 FROM alpine:3.6
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Update to have latest images
 RUN apk add --update python py-pip && \
diff --git a/docker/Dockerfile.cli b/docker/Dockerfile.cli
index 70757e4..5cebb9f 100755
--- a/docker/Dockerfile.cli
+++ b/docker/Dockerfile.cli
@@ -17,7 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 RUN mkdir /cli && touch /cli/__init__.py
diff --git a/docker/Dockerfile.cli_d b/docker/Dockerfile.cli_d
index 80db472..6def7e2 100755
--- a/docker/Dockerfile.cli_d
+++ b/docker/Dockerfile.cli_d
@@ -18,7 +18,7 @@
 FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 RUN mkdir /cli && touch /cli/__init__.py
diff --git a/docker/Dockerfile.dashd b/docker/Dockerfile.dashd
index c33446f..f317cd1 100755
--- a/docker/Dockerfile.dashd
+++ b/docker/Dockerfile.dashd
@@ -17,7 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 RUN mkdir /dashd && touch /dashd/__init__.py
diff --git a/docker/Dockerfile.golang b/docker/Dockerfile.golang
index b23f9e6..30eb58f 100644
--- a/docker/Dockerfile.golang
+++ b/docker/Dockerfile.golang
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM golang:1.9.2
-MAINTAINER Alex Peters <info@alexanderpeters.de>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 RUN apt-get update && apt-get install -y apt-transport-https ca-certificates jq curl gnupg2 software-properties-common
 
diff --git a/docker/Dockerfile.grafana b/docker/Dockerfile.grafana
index a821747..6ce0c51 100755
--- a/docker/Dockerfile.grafana
+++ b/docker/Dockerfile.grafana
@@ -14,7 +14,7 @@
 
 FROM kamon/grafana_graphite:3.0
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Update the configuration so grafana runs at a different root
 # everything else remains as defined in the kamon version
diff --git a/docker/Dockerfile.netconf b/docker/Dockerfile.netconf
index 666750c..934c91f 100644
--- a/docker/Dockerfile.netconf
+++ b/docker/Dockerfile.netconf
@@ -17,9 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Install protoc version 3.0.0; this is not yet the supported
 # version on xenial, so we need to "backport" it
diff --git a/docker/Dockerfile.netopeer b/docker/Dockerfile.netopeer
index 4b31e55..6a767cf 100644
--- a/docker/Dockerfile.netopeer
+++ b/docker/Dockerfile.netopeer
@@ -14,7 +14,7 @@
 
 FROM centos:7
 
-MAINTAINER Stephane Barbarie <sbarbari@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # install required packages
 RUN ["yum", "install", "-y", "epel-release"]
diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx
index 5910449..626edbb 100755
--- a/docker/Dockerfile.nginx
+++ b/docker/Dockerfile.nginx
@@ -17,7 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 # Handle pre-requisites
diff --git a/docker/Dockerfile.ofagent b/docker/Dockerfile.ofagent
index 9ac0c05..48b4728 100644
--- a/docker/Dockerfile.ofagent
+++ b/docker/Dockerfile.ofagent
@@ -17,9 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Install protoc version 3.0.0; this is not yet the supported
 # version on xenial, so we need to "backport" it
diff --git a/docker/Dockerfile.ofagent_d b/docker/Dockerfile.ofagent_d
index 6c9fa86..193a0da 100644
--- a/docker/Dockerfile.ofagent_d
+++ b/docker/Dockerfile.ofagent_d
@@ -18,9 +18,7 @@
 FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Install protoc version 3.0.0; this is not yet the supported
 # version on xenial, so we need to "backport" it
diff --git a/docker/Dockerfile.shovel b/docker/Dockerfile.shovel
index 163a2ca..aecc47d 100644
--- a/docker/Dockerfile.shovel
+++ b/docker/Dockerfile.shovel
@@ -17,9 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 RUN mkdir /shovel && touch /shovel/__init__.py
diff --git a/docker/Dockerfile.tester b/docker/Dockerfile.tester
index ba7deb9..6c22ad6 100644
--- a/docker/Dockerfile.tester
+++ b/docker/Dockerfile.tester
@@ -17,9 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 RUN apt update && apt install -y iperf isc-dhcp-client tcpdump net-tools iproute2 iputils-ping wpasupplicant
 
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
index dfc3e9d..a173af7 100755
--- a/docker/Dockerfile.tools
+++ b/docker/Dockerfile.tools
@@ -17,7 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 #RUN mkdir /cli && touch /cli/__init__.py
diff --git a/docker/Dockerfile.voltha b/docker/Dockerfile.voltha
index 0b3853a..89d7138 100644
--- a/docker/Dockerfile.voltha
+++ b/docker/Dockerfile.voltha
@@ -17,9 +17,7 @@
 
 FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
-MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
-MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
-MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+MAINTAINER Voltha Community <info@opennetworking.org>
 
 # Bundle app source
 RUN mkdir /voltha && touch /voltha/__init__.py
diff --git a/setup.py b/setup.py
index dc1a324..3f8a818 100644
--- a/setup.py
+++ b/setup.py
@@ -7,17 +7,15 @@
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
-twisted_deps = ['twisted']
-scapy_deps = ['scapy>=2.2.0']
 setup(
     name = 'voltha',
     version = '1.3.0',
-    author = 'Zsolt Haraszti, Nathan Knuth, Ali Al-Shabibi',
-    author_email = 'voltha-discuss@opencord.org',
+    author = 'Open Networking Foundation, et al',
+    author_email = 'info@opennetworking.org',
     description = ('Virtual Optical Line Terminal (OLT) Hardware Abstraction'),
-    license = 'LICENSE.txt',
+    license = 'Apache License 2.0',
     keywords = 'volt gpon cord',
-    url = 'http://gerrit.opencord.org/voltha',
+    url = 'https://gerrit.opencord.org/#/q/project:voltha',
     packages=['voltha', 'tests'],
     long_description=read('README.md'),
     classifiers=[
@@ -26,11 +24,4 @@
         'Programming Language :: Python',
         'License :: OSI Approved :: Apache License 2.0',
     ],
-    install_requires=[
-        'six>1.7.2',
-    ],
-    extras_require={
-        'twisted': twisted_deps,
-        'all' : twisted_deps
-    },
 )