diff --git a/terraform/Dockerfile b/terraform/Dockerfile
index dd8266d..d0d811a 100644
--- a/terraform/Dockerfile
+++ b/terraform/Dockerfile
@@ -1,2 +1,2 @@
 FROM golang:onbuild
-MAINTAINER "Paul Hinze <paul@hashicorp.com>"
+MAINTAINER "HashiCorp Terraform Team <terraform@hashicorp.com>"
diff --git a/terraform/Dockerfile-full b/terraform/Dockerfile-full
index fae7c51..2090066 100644
--- a/terraform/Dockerfile-full
+++ b/terraform/Dockerfile-full
@@ -1,5 +1,5 @@
 FROM golang:alpine
-MAINTAINER "Paul Hinze <paul@hashicorp.com>"
+MAINTAINER "HashiCorp Terraform Team <terraform@hashicorp.com>"
 
 RUN apk add --update git bash
 RUN go get github.com/tools/godep
diff --git a/terraform/Dockerfile-light b/terraform/Dockerfile-light
index d6c3d82..118e39a 100644
--- a/terraform/Dockerfile-light
+++ b/terraform/Dockerfile-light
@@ -1,5 +1,5 @@
 FROM alpine:latest
-MAINTAINER "Paul Hinze <paul@hashicorp.com>"
+MAINTAINER "HashiCorp Terraform Team <terraform@hashicorp.com>"
 
 ENV TERRAFORM_VERSION=0.7.0
 ENV TERRAFORM_SHA256SUM=a196c63b967967343f3ae9bb18ce324a18b27690e2d105e1f38c5a2d7c02038d