diff --git a/base/BUILD b/base/BUILD
index 2130aa8..5405ab2 100644
--- a/base/BUILD
+++ b/base/BUILD
@@ -26,13 +26,3 @@
     name = "ubuntu-xenial-amd64-ssh",
     base = "@ubuntu-xenial-amd64-ssh//:image",
 )
-
-alias(
-    name = "ssh-bash-base",
-    actual = ":ubuntu-xenial-amd64-ssh",
-)
-
-alias(
-    name = "deploy-base",
-    actual = ":ubuntu-xenial-amd64-deploy",
-)
diff --git a/gerrit-github-sync/BUILD b/gerrit-github-sync/BUILD
index 031064b..0992c67 100644
--- a/gerrit-github-sync/BUILD
+++ b/gerrit-github-sync/BUILD
@@ -17,7 +17,7 @@
 
 docker_build(
     name = "gerrit-github-sync",
-    base = "//base:ssh-bash-base",
+    base = "//base:ubuntu-xenial-amd64-ssh",
     entrypoint = [
         "/bin/bash",
         "/gerrit-github-sync.sh",
diff --git a/jenkins/BUILD b/jenkins/BUILD
index aea171b..c5e639d 100644
--- a/jenkins/BUILD
+++ b/jenkins/BUILD
@@ -109,7 +109,7 @@
 
 docker_build(
     name = "deploy-base",
-    base = "//base:deploy-base",
+    base = "//base:ubuntu-xenial-amd64-deploy",
     directory = "/opt/data",
     env = {
         # We have to put those files on some secrets volume.
@@ -144,7 +144,7 @@
 
 docker_build(
     name = "ubuntu-with-bazel-installer",
-    base = "//base:deploy-base",
+    base = "//base:ubuntu-xenial-amd64-deploy",
     data_path = "/gce",
     directory = "/opt/run",
     files = ["//gce:bootstrap-bazel.sh"],