diff --git a/container/build.sh b/container/build.sh
index f45d05f..dc1bba2 100755
--- a/container/build.sh
+++ b/container/build.sh
@@ -40,8 +40,8 @@
   ["rbe-debian8"]="toolchain-packages.tar"
   ["rbe-debian9"]="toolchain-packages.tar"
   ["rbe-ubuntu16_04"]="toolchain-packages.tar"
-  ["ubuntu16_04-bazel"]="bazel_with_debs-packages.tar"
-  ["ubuntu16_04-bazel-docker"]="bazel_docker_with_debs-packages.tar"
+  ["ubuntu16_04-bazel"]="bazel-packages.tar"
+  ["ubuntu16_04-bazel-docker"]="bazel_docker-packages.tar"
 )
 
 show_usage () {
diff --git a/container/ubuntu16_04/builders/bazel/BUILD b/container/ubuntu16_04/builders/bazel/BUILD
index 26460bb..d8d3932 100644
--- a/container/ubuntu16_04/builders/bazel/BUILD
+++ b/container/ubuntu16_04/builders/bazel/BUILD
@@ -38,6 +38,7 @@
         "//container/ubuntu16_04/layers/bazel:bazel-tools",
         "//container/ubuntu16_04/layers/bazel:bazel-ltl",
         "//container/ubuntu16_04/layers/git:git-ltl",
+        "//container/ubuntu16_04/layers/wget:wget-ltl",
     ],
 )
 
@@ -50,6 +51,7 @@
         "//container/ubuntu16_04:ubuntu16_04.yaml",
         "//container/ubuntu16_04/layers/bazel:bazel.yaml",
         "//container/ubuntu16_04/layers/git:git.yaml",
+        "//container/ubuntu16_04/layers/wget:wget.yaml",
     ],
     image = ":bazel",
     verbose = True,
@@ -64,6 +66,10 @@
         "-c",
         "/bin/bash",
     ],
+    # TODO(xingao) Fix this. We should not remove /etc/ssl/certs/java/cacerts
+    # file in the java-ltl, but instead, archive it for future container
+    # reproduction.
+    installation_cleanup_commands = "update-ca-certificates -f",
     language_layers = [
         "//container/ubuntu16_04/layers/docker-17.12.0:docker-ltl",
     ],
@@ -79,6 +85,7 @@
         "//container/ubuntu16_04/layers/bazel:bazel.yaml",
         "//container/ubuntu16_04/layers/docker-17.12.0:docker-17.12.0.yaml",
         "//container/ubuntu16_04/layers/git:git.yaml",
+        "//container/ubuntu16_04/layers/wget:wget.yaml",
     ],
     image = ":bazel_docker",
     verbose = True,
diff --git a/container/ubuntu16_04/builders/bazel/container.yaml b/container/ubuntu16_04/builders/bazel/container.yaml
index a6b95d4..1173d15 100644
--- a/container/ubuntu16_04/builders/bazel/container.yaml
+++ b/container/ubuntu16_04/builders/bazel/container.yaml
@@ -1,6 +1,5 @@
 schemaVersion: "2.0.0"
 
-# Common tests
 commandTests:
 - name: 'gcc-version'
   command: 'gcc'
diff --git a/container/ubuntu16_04/layers/bazel/bazel.yaml b/container/ubuntu16_04/layers/bazel/bazel.yaml
index 267ab48..6ba4cbb 100644
--- a/container/ubuntu16_04/layers/bazel/bazel.yaml
+++ b/container/ubuntu16_04/layers/bazel/bazel.yaml
@@ -1,6 +1,5 @@
 schemaVersion: "2.0.0"
 
-# Common tests
 commandTests:
 - name: 'check-bazel'
   command: 'bazel'
diff --git a/container/ubuntu16_04/layers/docker-17.12.0/docker-17.12.0.yaml b/container/ubuntu16_04/layers/docker-17.12.0/docker-17.12.0.yaml
index 4d93e6c..37477d7 100644
--- a/container/ubuntu16_04/layers/docker-17.12.0/docker-17.12.0.yaml
+++ b/container/ubuntu16_04/layers/docker-17.12.0/docker-17.12.0.yaml
@@ -1,6 +1,5 @@
 schemaVersion: "2.0.0"
 
-# Common tests
 commandTests:
 - name: 'check-docker'
   command: 'docker'
diff --git a/container/ubuntu16_04/layers/git/git.yaml b/container/ubuntu16_04/layers/git/git.yaml
index e9b0a54..b53979e 100644
--- a/container/ubuntu16_04/layers/git/git.yaml
+++ b/container/ubuntu16_04/layers/git/git.yaml
@@ -1,6 +1,5 @@
 schemaVersion: "2.0.0"
 
-# Common tests
 commandTests:
 - name: 'check-git'
   command: 'git'
diff --git a/container/ubuntu16_04/layers/wget/BUILD b/container/ubuntu16_04/layers/wget/BUILD
new file mode 100644
index 0000000..3bb51c3
--- /dev/null
+++ b/container/ubuntu16_04/layers/wget/BUILD
@@ -0,0 +1,30 @@
+# Copyright 2017 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
+
+load("//container/rules:docker_toolchains.bzl", "language_tool_layer")
+
+exports_files(["wget.yaml"])
+
+language_tool_layer(
+    name = "wget-ltl",
+    base = "@ubuntu16_04//image",
+    packages = [
+        "ca-certificates",
+        "wget",
+    ],
+)
diff --git a/container/ubuntu16_04/layers/wget/wget.yaml b/container/ubuntu16_04/layers/wget/wget.yaml
new file mode 100644
index 0000000..0eafc1f
--- /dev/null
+++ b/container/ubuntu16_04/layers/wget/wget.yaml
@@ -0,0 +1,6 @@
+schemaVersion: "2.0.0"
+
+- name: 'check-wget'
+  command: 'wget'
+  args: ['--version']
+  expectedOutput: ['GNU Wget.* built on linux-gnu.*']
diff --git a/test/container/BUILD b/test/container/BUILD
index d8acd53..de8db77 100644
--- a/test/container/BUILD
+++ b/test/container/BUILD
@@ -95,7 +95,7 @@
 
 add_apt_key(
     name = "test-docker-with-keys",
-    image_tar = ":docker-prereq-test.tar",
+    image = ":docker-prereq-test.tar",
     keys = [
         "@debian_docker_gpg//file",
     ],