diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
index c58f690cb8..a49300c48c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile will build an image that is configured
 # to run Fluentd with an Elasticsearch plug-in and the
 # provided configuration file.
-# TODO(satnam6502): Use a lighter base image, e.g. some form of busybox.
+# TODO(a-robinson): Use a lighter base image, e.g. some form of busybox.
 # The image acts as an executable for the binary /usr/sbin/td-agent.
 # Note that fluentd is run with root permssion to allow access to
 # log files with root only access under /var/lib/docker/containers/*
@@ -9,7 +9,7 @@
 # information about installing fluentd using deb package.
 
 FROM ubuntu:14.04
-MAINTAINER Satnam Singh "satnam@google.com"
+MAINTAINER Alex Robinson "arob@google.com"
 
 # Ensure there are enough file descriptors for running Fluentd.
 RUN ulimit -n 65536
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index 836a2fe7ae..ef21e3e244 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -6,7 +6,6 @@
 # Elasticsearch which assumes the installation of the fluentd-elasticsearch plug-in.
 # See https://github.com/uken/fluent-plugin-elasticsearch for
 # more information about the plug-in.
-# Maintainer: Satnam Singh (satnam@google.com)
 #
 # Example
 # =======
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
index 1eaf961ce3..2554df0611 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
@@ -7,7 +7,7 @@
 # in the Google Developer Console. 
 
 FROM ubuntu:14.04
-MAINTAINER Satnam Singh "satnam@google.com"
+MAINTAINER Alex Robinson "arob@google.com"
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index d257881212..f0ae8833ec 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -1,7 +1,6 @@
 # The build rule builds a Docker image that logs all Docker contains logs to
 # Google Compute Platform using the Cloud Logging API. The push rule pushes
 # the image to DockerHub.
-# Satnam Singh (satnam@google.com)
 
 # Procedure for change:
 # 1. Bump the tag number.
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index a301078895..9d481ec54a 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -4,7 +4,6 @@
 # linked to from the /varlog directory using names that capture the
 # pod name and container name. These logs are then submitted to
 # Google Cloud Logging which assumes the installation of the cloud-logging plug-in.
-# Maintainer: Satnam Singh (satnam@google.com)
 #
 # Example
 # =======