diff --git a/configs/debian8_clang/BUILD b/configs/debian8_clang/BUILD
index 419ef89..58845e5 100644
--- a/configs/debian8_clang/BUILD
+++ b/configs/debian8_clang/BUILD
@@ -53,6 +53,7 @@
 
 # Created on 2018.01.10
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:62ad7c44890792fdb2c2593fc24cfab7132e3a112d55bd453e09387906ae5e2f
+# Clang revision: r319946
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.2.0-bazel_0.9.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -67,6 +68,7 @@
 
 # Created on 2018.02.05
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:e57978199c9eb156bd7f63773387f3a238adf61acd71c4942ad91da50b4f241f
+# Clang revision: r319946
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.2.0-bazel_0.10.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -81,6 +83,7 @@
 
 # Created on 2018.02.13
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:ac3b1fdc22c0f2b95abe67f2daf33788425fab52d4e6845900bfe1a42443098f
+# Clang revision: r322167
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.3.0-bazel_0.10.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -95,6 +98,7 @@
 
 # Created on 2018.04.06
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:ac3b1fdc22c0f2b95abe67f2daf33788425fab52d4e6845900bfe1a42443098f
+# Clang revision: r322167
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.11.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -111,6 +115,7 @@
 
 # Created on 2018.04.23
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:213da2494bb763f55363213db45d9bfa5eb906039fc02e6cb2e6637dc4917caf
+# Clang revision: r327695
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.3.0-bazel_0.12.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -125,6 +130,7 @@
 
 # Created on 2018.04.23
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:213da2494bb763f55363213db45d9bfa5eb906039fc02e6cb2e6637dc4917caf
+# Clang revision: r327695
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.12.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -141,6 +147,7 @@
 
 # Created on 2018.04.30
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:213da2494bb763f55363213db45d9bfa5eb906039fc02e6cb2e6637dc4917caf
+# Clang revision: r327695
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.3.0-bazel_0.13.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -155,6 +162,7 @@
 
 # Created on 2018.04.30
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:213da2494bb763f55363213db45d9bfa5eb906039fc02e6cb2e6637dc4917caf
+# Clang revision: r327695
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.13.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -171,6 +179,7 @@
 
 # Created on 2018.06.08
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:8bb65bf0a0da8be48bbac07ebe743805f3dc5259203e19517098162bd23a768f
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.3.0-bazel_0.14.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -185,6 +194,7 @@
 
 # Created on 2018.06.08
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:8bb65bf0a0da8be48bbac07ebe743805f3dc5259203e19517098162bd23a768f
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.14.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -201,6 +211,7 @@
 
 # Created on 2018.06.27
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:8bb65bf0a0da8be48bbac07ebe743805f3dc5259203e19517098162bd23a768f
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "debian8-clang-0.3.0-bazel_0.15.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -215,6 +226,7 @@
 
 # Created on 2018.06.27
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:8bb65bf0a0da8be48bbac07ebe743805f3dc5259203e19517098162bd23a768f
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.15.0-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -233,6 +245,7 @@
 # modified directly.
 # Created on 2018.8.13
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:de1116d36eafe16890afd64b6bc6809a3ed5b3597ed7bc857980749270894677
+# Clang revision: r337145
 docker_toolchain_autoconfig(
     name = "default-debian8-clang-0.3.0-bazel_0.16.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -249,6 +262,7 @@
 # modified directly.
 # Created on 2018.8.13
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:de1116d36eafe16890afd64b6bc6809a3ed5b3597ed7bc857980749270894677
+# Clang revision: r337145
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.3.0-bazel_0.16.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -267,6 +281,7 @@
 # modified directly.
 # Created on 2018.9.6
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:0946899544c00537b2af06790e72ba86aa39b16e0e05aef8f53ed79d1f89f2a0
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "default-debian8-clang-0.4.0-bazel_0.16.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -283,6 +298,7 @@
 # modified directly.
 # Created on 2018.9.6
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:0946899544c00537b2af06790e72ba86aa39b16e0e05aef8f53ed79d1f89f2a0
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.4.0-bazel_0.16.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -301,6 +317,7 @@
 # modified directly.
 # Created on 2018.9.17
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:0946899544c00537b2af06790e72ba86aa39b16e0e05aef8f53ed79d1f89f2a0
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "default-debian8-clang-0.4.0-bazel_0.17.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
@@ -317,6 +334,7 @@
 # modified directly.
 # Created on 2018.9.17
 # Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:0946899544c00537b2af06790e72ba86aa39b16e0e05aef8f53ed79d1f89f2a0
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "msan-debian8-clang-0.4.0-bazel_0.17.1-autoconfig",
     additional_repos = debian8_clang_default_repos(),
diff --git a/configs/ubuntu16_04_clang/BUILD b/configs/ubuntu16_04_clang/BUILD
index 72aa7f9..875da97 100644
--- a/configs/ubuntu16_04_clang/BUILD
+++ b/configs/ubuntu16_04_clang/BUILD
@@ -27,6 +27,7 @@
 
 # Created on 2018.05.09
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -41,6 +42,7 @@
 
 # Created on 2018.05.09
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -57,6 +59,7 @@
 
 # Created on 2018.06.08
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -71,6 +74,7 @@
 
 # Created on 2018.06.08
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -87,6 +91,7 @@
 
 # Created on 2018.06.27
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -101,6 +106,7 @@
 
 # Created on 2018.06.27
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:d553634f23f7c437ca35bbc4b6f1f38bb81be32b9ef2df4329dcd36762277bf7
+# Clang revision: r328903
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -119,6 +125,7 @@
 # modified directly.
 # Created on 2018.8.13
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:fbf123ca7c7696f53864da4f7d1d9470f9ef4ebfabc4344f44173d1951faee6f
+# Clang revision: r337145
 docker_toolchain_autoconfig(
     name = "default-ubuntu16_04-clang-1.0-bazel_0.16.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -135,6 +142,7 @@
 # modified directly.
 # Created on 2018.8.13
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:fbf123ca7c7696f53864da4f7d1d9470f9ef4ebfabc4344f44173d1951faee6f
+# Clang revision: r337145
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.0-bazel_0.16.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -153,6 +161,7 @@
 # modified directly.
 # Created on 2018.9.6
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:79a24c15949bd5770acac41b444c5c0b7f9723dcbc708c67d87ecf71e32c9126
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "default-ubuntu16_04-clang-1.1-bazel_0.16.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -169,6 +178,7 @@
 # modified directly.
 # Created on 2018.9.6
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:79a24c15949bd5770acac41b444c5c0b7f9723dcbc708c67d87ecf71e32c9126
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.1-bazel_0.16.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -187,6 +197,7 @@
 # modified directly.
 # Created on 2018.9.17
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:79a24c15949bd5770acac41b444c5c0b7f9723dcbc708c67d87ecf71e32c9126
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "default-ubuntu16_04-clang-1.1-bazel_0.17.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
@@ -203,6 +214,7 @@
 # modified directly.
 # Created on 2018.9.17
 # Container: gcr.io/cloud-marketplace/google/clang-ubuntu@sha256:79a24c15949bd5770acac41b444c5c0b7f9723dcbc708c67d87ecf71e32c9126
+# Clang revision: r340178
 docker_toolchain_autoconfig(
     name = "msan-ubuntu16_04-clang-1.1-bazel_0.17.1-autoconfig",
     additional_repos = ubuntu16_04_clang_default_repos(),
diff --git a/release/cc/create_artifacts.py b/release/cc/create_artifacts.py
index bb89598..d56382d 100644
--- a/release/cc/create_artifacts.py
+++ b/release/cc/create_artifacts.py
@@ -34,6 +34,7 @@
 LICENCE_TPL = os.path.join(GIT_ROOT, "release", "license.tpl")
 CPP_TPL = os.path.join(GIT_ROOT, "release", "cc", "cpp.tpl")
 SHA_MAP_FILE = os.path.join(GIT_ROOT, "rules/toolchain_containers.bzl")
+CLANG_REVISION_FILE = os.path.join(GIT_ROOT, "third_party/clang/revision.bzl")
 
 
 def create_targets(container_configs_list, bazel_version):
@@ -56,6 +57,8 @@
   """
 
   container_sha_map = imp.load_source("toolchain_containers", SHA_MAP_FILE)
+  clang_revision_map = imp.load_source("clang_revision", CLANG_REVISION_FILE)
+  clang_revision = clang_revision_map.CLANG_REVISION
 
   for container_configs in container_configs_list:
 
@@ -83,7 +86,8 @@
                 CONFIG_VERSION=container_configs.version,
                 BAZEL_VERSION=bazel_version,
                 NAME=container_configs.image,
-                SHA=sha)
+                SHA=sha,
+                CLANG_REVISION=clang_revision)
 
             build_file.write(tpl)
 
diff --git a/release/cc/default.tpl b/release/cc/default.tpl
index 67b79be..a7638b8 100644
--- a/release/cc/default.tpl
+++ b/release/cc/default.tpl
@@ -3,6 +3,7 @@
 # modified directly.
 # Created on ${DATE}
 # Container: ${NAME}@${SHA}
+# Clang revision: ${CLANG_REVISION}
 docker_toolchain_autoconfig(
     name = "default-${DISTRO}-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig",
     additional_repos = ${DISTRO}_clang_default_repos(),
diff --git a/release/cc/msan.tpl b/release/cc/msan.tpl
index c7e9d6a..10b4f1b 100644
--- a/release/cc/msan.tpl
+++ b/release/cc/msan.tpl
@@ -3,6 +3,7 @@
 # modified directly.
 # Created on ${DATE}
 # Container: ${NAME}@${SHA}
+# Clang revision: ${CLANG_REVISION}
 docker_toolchain_autoconfig(
     name = "msan-${DISTRO}-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig",
     additional_repos = ${DISTRO}_clang_default_repos(),