diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fcbf80cef1..12b76028aa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 7414ad7ef9108d406b1f6b17ebce19e32aee9f70
+  SAMBA_CI_CONTAINER_TAG: c6ee634a9467e84ee8dd858b0b363f7a75973a66
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 196f9bdf8eb..62a59b5cc57 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -36,6 +36,7 @@ COMMON = [
     'autoconf',
     'binutils',
     'bison',
+    'ccache',
     'curl',
     'chrpath',
     'flex',
@@ -56,6 +57,7 @@ COMMON = [
     'sudo',  # docker images has no sudo by default
     'tar',
     'tree',
+    'wget',
 ]
 
 
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 37f5d684663..9c81a1e1e68 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -22,6 +22,7 @@ yum install -y \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     compat-gnutls34-devel \
     cups-devel \
@@ -99,6 +100,7 @@ yum install -y \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 1b80882bd8c..55502974829 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -8,6 +8,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - compat-gnutls34-devel
   - cups-devel
@@ -85,6 +86,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 61debd5e2ee..a211daf2162 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -23,6 +23,7 @@ yum install -y \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     cups-devel \
     curl \
@@ -103,6 +104,7 @@ yum install -y \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 2467b35dafb..4d87303bcc2 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -8,6 +8,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - cups-devel
   - curl
@@ -88,6 +89,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index 9391c1ca815..94f85473811 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -19,6 +19,7 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
+    ccache \
     chrpath \
     curl \
     debhelper \
@@ -98,6 +99,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    wget \
     xfslibs-dev \
     xsltproc \
     zlib1g-dev
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index dee4d5cef20..ff45afedf93 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -8,6 +8,7 @@ packages:
   - binutils
   - bison
   - build-essential
+  - ccache
   - chrpath
   - curl
   - debhelper
@@ -87,6 +88,7 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - wget
   - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 09d36e88058..4bbda3ce3c8 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -19,6 +19,7 @@ dnf install -y \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     cups-devel \
     curl \
@@ -103,6 +104,7 @@ dnf install -y \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index a2fbd0eb83b..4a8356cddb3 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -8,6 +8,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - cups-devel
   - curl
@@ -92,6 +93,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 09d36e88058..4bbda3ce3c8 100755
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -19,6 +19,7 @@ dnf install -y \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     cups-devel \
     curl \
@@ -103,6 +104,7 @@ dnf install -y \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
index a2fbd0eb83b..4a8356cddb3 100644
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -8,6 +8,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - cups-devel
   - curl
@@ -92,6 +93,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 341b0ef9d35..1a38fbdef22 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -19,6 +19,7 @@ zypper --non-interactive install \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     cups-devel \
     curl \
@@ -95,6 +96,7 @@ zypper --non-interactive install \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index b8c469cadca..bfb352f749e 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -7,6 +7,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - cups-devel
   - curl
@@ -83,6 +84,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 341b0ef9d35..1a38fbdef22 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -19,6 +19,7 @@ zypper --non-interactive install \
     bind-utils \
     binutils \
     bison \
+    ccache \
     chrpath \
     cups-devel \
     curl \
@@ -95,6 +96,7 @@ zypper --non-interactive install \
     systemd-devel \
     tar \
     tree \
+    wget \
     which \
     xfsprogs-devel \
     yum-utils \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index b8c469cadca..bfb352f749e 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -7,6 +7,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - ccache
   - chrpath
   - cups-devel
   - curl
@@ -83,6 +84,7 @@ packages:
   - systemd-devel
   - tar
   - tree
+  - wget
   - which
   - xfsprogs-devel
   - yum-utils
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index f5791357d45..ab66f088448 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -19,6 +19,7 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
+    ccache \
     chrpath \
     curl \
     debhelper \
@@ -97,6 +98,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    wget \
     xfslibs-dev \
     xsltproc \
     zlib1g-dev
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 932cc162041..d0a773558b4 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -8,6 +8,7 @@ packages:
   - binutils
   - bison
   - build-essential
+  - ccache
   - chrpath
   - curl
   - debhelper
@@ -86,6 +87,7 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - wget
   - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index e668057ea82..013f289d880 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -19,6 +19,7 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
+    ccache \
     chrpath \
     curl \
     debhelper \
@@ -99,6 +100,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    wget \
     xfslibs-dev \
     xsltproc \
     zlib1g-dev
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index edf5720f84c..2ba03c496af 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -8,6 +8,7 @@ packages:
   - binutils
   - bison
   - build-essential
+  - ccache
   - chrpath
   - curl
   - debhelper
@@ -88,6 +89,7 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - wget
   - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index e668057ea82..013f289d880 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -19,6 +19,7 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
+    ccache \
     chrpath \
     curl \
     debhelper \
@@ -99,6 +100,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    wget \
     xfslibs-dev \
     xsltproc \
     zlib1g-dev
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index edf5720f84c..2ba03c496af 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -8,6 +8,7 @@ packages:
   - binutils
   - bison
   - build-essential
+  - ccache
   - chrpath
   - curl
   - debhelper
@@ -88,6 +89,7 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - wget
   - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 085ef7c5297..97c1408594b 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-7414ad7ef9108d406b1f6b17ebce19e32aee9f70
+c6ee634a9467e84ee8dd858b0b363f7a75973a66