diff --git a/Base/Dockerfile b/Base/Dockerfile
index fbcde3e9a..3536575fa 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -1,5 +1,5 @@
 FROM phusion/baseimage:0.9.15
-MAINTAINER Leo Gallucci <elgalu3@gmail.com>
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 #================================================
 # Customize sources for apt-get
diff --git a/Hub/Dockerfile b/Hub/Dockerfile
index d5b1563a0..9731e4981 100644
--- a/Hub/Dockerfile
+++ b/Hub/Dockerfile
@@ -1,5 +1,5 @@
 FROM elgalu/selenium-base:2.44.0
-MAINTAINER Leo Gallucci <elgalu3@gmail.com>
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 #==========================================
 # Scripts to run selenium hub as a service
diff --git a/Makefile b/Makefile
index 59cc54d86..db667fd67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME := elgalu/selenium
+NAME := selenium
 VERSION := $(or $(VERSION),$(VERSION),'2.44.0')
 PLATFORM := $(shell uname -s)
 
@@ -13,13 +13,13 @@ all: hub chrome firefox full
 build: all clean
 
 base:
-	cd ./Base && docker build -t $(NAME)-base:$(VERSION) .
+	cd ./Base && docker build -t $(NAME)/base:$(VERSION) .
 
 hub: base
-	cd ./Hub && docker build -t $(NAME)-hub:$(VERSION) .
+	cd ./Hub && docker build -t $(NAME)/hub:$(VERSION) .
 
 nodebase: base
-	cd ./NodeBase && docker build -t $(NAME)-node-base:$(VERSION) .
+	cd ./NodeBase && docker build -t $(NAME)/node-base:$(VERSION) .
 
 chrome: nodebase
 	rm -rf chrome_image
@@ -27,7 +27,7 @@ chrome: nodebase
 	cp build/Dockerfile chrome_image/Dockerfile
 	cp build/install.sh chrome_image/build/install.sh
 	cp $(COPYARGS) build/chrome chrome_image/build/
-	cd ./chrome_image && docker build -t $(NAME)-node-chrome:$(VERSION) .
+	cd ./chrome_image && docker build -t $(NAME)/node-chrome:$(VERSION) .
 
 firefox: nodebase
 	rm -rf firefox_image
@@ -35,7 +35,7 @@ firefox: nodebase
 	cp build/Dockerfile firefox_image/Dockerfile
 	cp build/install.sh firefox_image/build/install.sh
 	cp $(COPYARGS) build/firefox firefox_image/build/
-	cd ./firefox_image && docker build -t $(NAME)-node-firefox:$(VERSION) .
+	cd ./firefox_image && docker build -t $(NAME)/node-firefox:$(VERSION) .
 
 full: nodebase
 	rm -rf full_image
@@ -43,29 +43,29 @@ full: nodebase
 	cp build/Dockerfile full_image/Dockerfile
 	cp $(COPYARGS) build/ full_image/build/
 	cp $(COPYARGS) Hub/etc/ full_image/build/full/etc/
-	cd ./full_image && docker build -t $(NAME)-full:$(VERSION) .
+	cd ./full_image && docker build -t $(NAME)/full:$(VERSION) .
 
 tag_latest:
-	docker tag $(NAME)-base:$(VERSION) $(NAME)-base:latest
-	docker tag $(NAME)-hub:$(VERSION) $(NAME)-hub:latest
-	docker tag $(NAME)-node-base:$(VERSION) $(NAME)-node-base:latest
-	docker tag $(NAME)-node-chrome:$(VERSION) $(NAME)-node-chrome:latest
-	docker tag $(NAME)-node-firefox:$(VERSION) $(NAME)-node-firefox:latest
-	docker tag $(NAME)-full:$(VERSION) $(NAME)-full:latest
+	docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
+	docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:latest
+	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
+	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
+	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
+	docker tag $(NAME)/full:$(VERSION) $(NAME)/full:latest
 
 release: tag_latest
-	@if ! docker images $(NAME)-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)-hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)-node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)-node-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-node-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)-node-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-node-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)-full | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)-full version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	docker push $(NAME)-base
-	docker push $(NAME)-hub
-	docker push $(NAME)-node-base
-	docker push $(NAME)-node-chrome
-	docker push $(NAME)-node-firefox
-	docker push $(NAME)-full
+	@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/node-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/node-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/full | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/full version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	docker push $(NAME)/base
+	docker push $(NAME)/hub
+	docker push $(NAME)/node-base
+	docker push $(NAME)/node-chrome
+	docker push $(NAME)/node-firefox
+	docker push $(NAME)/full
 	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
 
 clean:
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
index 8d7042e72..b1f342be8 100644
--- a/NodeBase/Dockerfile
+++ b/NodeBase/Dockerfile
@@ -1,5 +1,5 @@
 FROM elgalu/selenium-base:2.44.0
-MAINTAINER Leo Gallucci <elgalu3@gmail.com>
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 #=================
 # Locale settings
diff --git a/build/Dockerfile b/build/Dockerfile
index 6204111c4..e915aa2c3 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,5 @@
 FROM elgalu/selenium-node-base:2.44.0
-MAINTAINER Leo Gallucci <elgalu3@gmail.com>
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 COPY ./build /tmp/build
 RUN chmod +x /tmp/build/install.sh \