diff --git a/build/docs/toolchains.rst b/build/docs/toolchains.rst
index d7714ea3db32..8189180b2846 100644
--- a/build/docs/toolchains.rst
+++ b/build/docs/toolchains.rst
@@ -72,7 +72,7 @@ Archiving the Gradle executable is straight-forward, but archiving a
 local Maven repository is not.  Therefore a special Task Cluster
 Docker image and job exist for producing the required archives.  The
 Docker image definition is rooted in
-``taskcluster/docker/android-gradle-build``.  The Task Cluster job
+``taskcluster/docker/android-build``.  The Task Cluster job
 definition is in
 ``testing/taskcluster/tasks/builds/android_api_16_gradle_dependencies.yml``.
 The job runs in a container based on the custom Docker image and
diff --git a/taskcluster/ci/build/android-stuff.yml b/taskcluster/ci/build/android-stuff.yml
index 834c98cd950e..c415f852f0df 100644
--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@@ -10,7 +10,7 @@ android-dependencies/opt:
         symbol: tc(Deps)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
-        docker-image: {in-tree: android-gradle-build}
+        docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle-online"
             PERFHERDER_EXTRA_OPTIONS: android-dependencies
@@ -44,7 +44,7 @@ android-dependencies/opt:
         - - "mobile/android/config/**"
           - "testing/mozharness/configs/builds/releng_sub_android_configs/*gradle_dependencies.py"
           - "**/*.gradle"
-          - "taskcluster/docker/android-gradle-build/**"
+          - "taskcluster/docker/android-build/**"
 
 android-test/opt:
     description: "Android armv7 unit tests"
diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
index 3a8c543283d4..dae90ed50be9 100644
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -22,7 +22,7 @@ jobs:
     symbol: I(vb)
   lint:
     symbol: I(lnt)
-  android-gradle-build:
+  android-build:
     symbol: I(agb)
   index-task:
     symbol: I(idx)
diff --git a/taskcluster/docker/android-gradle-build/Dockerfile b/taskcluster/docker/android-build/Dockerfile
similarity index 100%
rename from taskcluster/docker/android-gradle-build/Dockerfile
rename to taskcluster/docker/android-build/Dockerfile
diff --git a/taskcluster/docker/android-gradle-build/README.md b/taskcluster/docker/android-build/README.md
similarity index 100%
rename from taskcluster/docker/android-gradle-build/README.md
rename to taskcluster/docker/android-build/README.md
diff --git a/taskcluster/docker/android-gradle-build/REGISTRY b/taskcluster/docker/android-build/REGISTRY
similarity index 100%
rename from taskcluster/docker/android-gradle-build/REGISTRY
rename to taskcluster/docker/android-build/REGISTRY
diff --git a/taskcluster/docker/android-gradle-build/VERSION b/taskcluster/docker/android-build/VERSION
similarity index 100%
rename from taskcluster/docker/android-gradle-build/VERSION
rename to taskcluster/docker/android-build/VERSION
diff --git a/taskcluster/docker/android-gradle-build/buildprops.json b/taskcluster/docker/android-build/buildprops.json
similarity index 100%
rename from taskcluster/docker/android-gradle-build/buildprops.json
rename to taskcluster/docker/android-build/buildprops.json
diff --git a/taskcluster/docker/android-gradle-build/dot-config/pip/pip.conf b/taskcluster/docker/android-build/dot-config/pip/pip.conf
similarity index 100%
rename from taskcluster/docker/android-gradle-build/dot-config/pip/pip.conf
rename to taskcluster/docker/android-build/dot-config/pip/pip.conf
diff --git a/taskcluster/docker/android-gradle-build/oauth.txt b/taskcluster/docker/android-build/oauth.txt
similarity index 100%
rename from taskcluster/docker/android-gradle-build/oauth.txt
rename to taskcluster/docker/android-build/oauth.txt
diff --git a/taskcluster/taskgraph/transforms/job/mozharness.py b/taskcluster/taskgraph/transforms/job/mozharness.py
index 3c3c7a5b9155..c397ccc79f5c 100644
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -110,7 +110,7 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
 
     # Running via mozharness assumes an image that contains build.sh:
     # by default, desktop-build, but it could be another image (like
-    # android-gradle-build) that "inherits" from desktop-build.
+    # android-build) that "inherits" from desktop-build.
     if not taskdesc['worker']['docker-image']:
         taskdesc['worker']['docker-image'] = {"in-tree": "desktop-build"}