diff --git a/METADATA b/METADATA
index e403a2f..264897b 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@
     type: GIT
     value: "https://github.com/google/fruit.git"
   }
-  version: "2c8435f9321f5158ee6259c6552e5eb9bee5106f"
+  version: "0ac041ff302faec7c8218989c86773613a621523"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 3
-    day: 31
+    month: 4
+    day: 1
   }
 }
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-17.04 b/extras/dockerfiles/Dockerfile.ubuntu-17.04
deleted file mode 100644
index ee50dcc..0000000
--- a/extras/dockerfiles/Dockerfile.ubuntu-17.04
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:17.04
-MAINTAINER Marco Poletti <poletti.marco@gmail.com>
-
-COPY ubuntu-17.04_custom.list /etc/apt/sources.list.d/
-COPY common_install.sh common_cleanup.sh ubuntu-17.04_install.sh /
-
-RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list; \
-    bash -x /common_install.sh && \
-    bash -x /ubuntu-17.04_install.sh && \
-    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-18.10 b/extras/dockerfiles/Dockerfile.ubuntu-18.10
deleted file mode 100644
index 09bd008..0000000
--- a/extras/dockerfiles/Dockerfile.ubuntu-18.10
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ubuntu:18.10
-MAINTAINER Marco Poletti <poletti.marco@gmail.com>
-
-COPY ubuntu-18.10_custom.list /etc/apt/sources.list.d/
-COPY common_install.sh common_cleanup.sh ubuntu-18.10_install.sh /
-
-RUN bash -x /common_install.sh && \
-    bash -x /ubuntu-18.10_install.sh && \
-    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-19.10 b/extras/dockerfiles/Dockerfile.ubuntu-19.10
new file mode 100644
index 0000000..5ee6178
--- /dev/null
+++ b/extras/dockerfiles/Dockerfile.ubuntu-19.10
@@ -0,0 +1,9 @@
+FROM ubuntu:19.10
+MAINTAINER Marco Poletti <poletti.marco@gmail.com>
+
+COPY ubuntu-19.10_custom.list /etc/apt/sources.list.d/
+COPY common_install.sh common_cleanup.sh ubuntu-19.10_install.sh /
+
+RUN bash -x /common_install.sh && \
+    bash -x /ubuntu-19.10_install.sh && \
+    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh
index ba63b2c..1e0b58b 100644
--- a/extras/dockerfiles/common_install.sh
+++ b/extras/dockerfiles/common_install.sh
@@ -3,7 +3,7 @@
 set -e
 
 apt-get update -qq
-apt-get install -y --no-install-recommends wget gnupg
+apt-get install -y --no-install-recommends wget gnupg ca-certificates apt-transport-https
 
 wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
 
diff --git a/extras/dockerfiles/rebuild_all.sh b/extras/dockerfiles/rebuild_all.sh
index 545df07..f84dbbd 100755
--- a/extras/dockerfiles/rebuild_all.sh
+++ b/extras/dockerfiles/rebuild_all.sh
@@ -7,7 +7,7 @@
 
 COMMANDS=()
 
-for V in 16.04 17.04 18.04 18.10 19.04 16.04
+for V in 16.04 18.04 19.04 16.04 19.10
 do
   C="docker build -t polettimarco/fruit-basesystem:ubuntu-$V -f Dockerfile.ubuntu-$V ."
   COMMANDS+=("$C || { echo; echo FAILED: '$C'; echo; exit 1; }")
diff --git a/extras/dockerfiles/ubuntu-16.04_custom.list b/extras/dockerfiles/ubuntu-16.04_custom.list
index 54c95ff..e69de29 100644
--- a/extras/dockerfiles/ubuntu-16.04_custom.list
+++ b/extras/dockerfiles/ubuntu-16.04_custom.list
@@ -1,11 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main 
-deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main
-deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
-deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
-deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
-deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
-deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
-deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
-deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
-deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
-deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8
diff --git a/extras/dockerfiles/ubuntu-16.04_install.sh b/extras/dockerfiles/ubuntu-16.04_install.sh
index 4d47e56..071fda1 100644
--- a/extras/dockerfiles/ubuntu-16.04_install.sh
+++ b/extras/dockerfiles/ubuntu-16.04_install.sh
@@ -2,11 +2,30 @@
 
 set -e
 
-apt-get install -y --no-install-recommends \
-    curl
+cat <<EOF >/etc/apt/sources.list.d/custom.list
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
+EOF
 
-# For the Bazel repository
-curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
+apt-get update -qq
 
 apt-get install -y --allow-unauthenticated --no-install-recommends \
     clang-3.5 \
@@ -15,13 +34,18 @@
     clang-3.8 \
     clang-3.9 \
     clang-4.0 \
+    clang-5.0 \
+    clang-6.0 \
+    clang-7 \
+    clang-8 \
+    clang-9 \
+    clang-10 \
     g++-5 \
     g++-4.9 \
     g++-6 \
     python \
-    bazel \
     git \
-    openjdk-8-jdk \
+    clang-tidy \
     clang-format
 
 pip3 install typed_ast
diff --git a/extras/dockerfiles/ubuntu-17.04_custom.list b/extras/dockerfiles/ubuntu-17.04_custom.list
deleted file mode 100644
index dfafeb4..0000000
--- a/extras/dockerfiles/ubuntu-17.04_custom.list
+++ /dev/null
@@ -1,8 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main 
-deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main
-deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty main
-deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty main
-deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main
-deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main
-deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main
-deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main
diff --git a/extras/dockerfiles/ubuntu-17.04_install.sh b/extras/dockerfiles/ubuntu-17.04_install.sh
deleted file mode 100644
index 6c774ef..0000000
--- a/extras/dockerfiles/ubuntu-17.04_install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
-
-apt-get install -y --allow-unauthenticated --no-install-recommends \
-    clang-3.7 \
-    clang-3.8 \
-    clang-3.9 \
-    clang-4.0 \
-    g++-5 \
-    g++-4.9 \
-    g++-6 \
-    python \
-    clang-format
-
-pip3 install typed_ast
diff --git a/extras/dockerfiles/ubuntu-18.04_install.sh b/extras/dockerfiles/ubuntu-18.04_install.sh
index 3d4cde7..7c1aa3d 100644
--- a/extras/dockerfiles/ubuntu-18.04_install.sh
+++ b/extras/dockerfiles/ubuntu-18.04_install.sh
@@ -10,19 +10,42 @@
 
 echo 'deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8' >> /etc/apt/sources.list.d/bazel.list
 
+cat <<EOF >/etc/apt/sources.list.d/custom.list
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main
+EOF
+
 apt-get update -qq
 
 apt-get install -y --allow-unauthenticated --no-install-recommends \
     g++-8 \
     g++-7 \
+    g++-6 \
     g++-5 \
     clang-3.9 \
     clang-4.0 \
     clang-5.0 \
     clang-6.0 \
+    clang-7 \
+    clang-8 \
+    clang-9 \
+    clang-10 \
     bazel \
     git \
     python \
     python3-sh \
     python3-typed-ast \
+    clang-tidy \
     clang-format
diff --git a/extras/dockerfiles/ubuntu-18.10_install.sh b/extras/dockerfiles/ubuntu-18.10_install.sh
deleted file mode 100644
index 1357b11..0000000
--- a/extras/dockerfiles/ubuntu-18.10_install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-apt-get install -y --allow-unauthenticated --no-install-recommends \
-    g++-7 \
-    g++-8 \
-    g++-5 \
-    clang-3.9 \
-    clang-4.0 \
-    clang-6.0 \
-    clang-7 \
-    python \
-    python3-sh \
-    python3-typed-ast \
-    clang-format
diff --git a/extras/dockerfiles/ubuntu-19.04_install.sh b/extras/dockerfiles/ubuntu-19.04_install.sh
index 2f78bdd..076073c 100644
--- a/extras/dockerfiles/ubuntu-19.04_install.sh
+++ b/extras/dockerfiles/ubuntu-19.04_install.sh
@@ -2,6 +2,19 @@
 
 set -e
 
+cat <<EOF >/etc/apt/sources.list.d/ubuntu-19.10_custom.list
+deb http://apt.llvm.org/disco/ llvm-toolchain-disco main
+deb-src http://apt.llvm.org/disco/ llvm-toolchain-disco main
+# 9
+deb http://apt.llvm.org/disco/ llvm-toolchain-disco-9 main
+deb-src http://apt.llvm.org/disco/ llvm-toolchain-disco-9 main
+# 10
+deb http://apt.llvm.org/disco/ llvm-toolchain-disco-10 main
+deb-src http://apt.llvm.org/disco/ llvm-toolchain-disco-10 main
+EOF
+
+apt-get update
+
 apt-get install -y --allow-unauthenticated --no-install-recommends \
     g++-7 \
     g++-8 \
@@ -12,4 +25,5 @@
     python \
     python3-sh \
     python3-typed-ast \
+    clang-tidy \
     clang-format
diff --git a/extras/dockerfiles/ubuntu-18.10_custom.list b/extras/dockerfiles/ubuntu-19.10_custom.list
similarity index 100%
rename from extras/dockerfiles/ubuntu-18.10_custom.list
rename to extras/dockerfiles/ubuntu-19.10_custom.list
diff --git a/extras/dockerfiles/ubuntu-19.10_install.sh b/extras/dockerfiles/ubuntu-19.10_install.sh
new file mode 100644
index 0000000..464c400
--- /dev/null
+++ b/extras/dockerfiles/ubuntu-19.10_install.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+cat <<EOF >/etc/apt/sources.list.d/ubuntu-19.10_custom.list
+deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main
+deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main
+deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main
+deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main
+deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main
+deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main
+EOF
+
+apt-get update
+
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    g++-7 \
+    g++-8 \
+    g++-9 \
+    clang-6.0 \
+    clang-7 \
+    clang-8 \
+    clang-9 \
+    clang-10 \
+    python \
+    python3-sh \
+    python3-typed-ast \
+    clang-tidy \
+    clang-format
diff --git a/extras/dockerfiles/ubuntu_arm-16.04_install.sh b/extras/dockerfiles/ubuntu_arm-16.04_install.sh
index 504b2c0..d692fb4 100644
--- a/extras/dockerfiles/ubuntu_arm-16.04_install.sh
+++ b/extras/dockerfiles/ubuntu_arm-16.04_install.sh
@@ -12,4 +12,5 @@
     g++-4.9 \
     g++-6 \
     python \
+    clang-tidy \
     clang-format
diff --git a/extras/dockerfiles/ubuntu_arm-18.04_custom.list b/extras/dockerfiles/ubuntu_arm-18.04_custom.list
index e347ae1..e69de29 100644
--- a/extras/dockerfiles/ubuntu_arm-18.04_custom.list
+++ b/extras/dockerfiles/ubuntu_arm-18.04_custom.list
@@ -1,8 +0,0 @@
-#deb [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main
-#deb-src [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main
-#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
-#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
-#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-4.0 main
-#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-4.0 main
-#deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
-#deb-src [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
diff --git a/extras/dockerfiles/ubuntu_arm-18.04_install.sh b/extras/dockerfiles/ubuntu_arm-18.04_install.sh
index 8e21982..ea2d240 100644
--- a/extras/dockerfiles/ubuntu_arm-18.04_install.sh
+++ b/extras/dockerfiles/ubuntu_arm-18.04_install.sh
@@ -13,4 +13,5 @@
     python \
     python3-sh \
     python3-typed-ast \
+    clang-tidy \
     clang-format