diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbb1e173c06..01ef8e0e6b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 14f5cb79a0fbeef9378506ecdc6881d8042736c9
+  SAMBA_CI_CONTAINER_TAG: a63fcd17331238531d472206e34aa24c9fc46bb1
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!
diff --git a/bootstrap/config.py b/bootstrap/config.py
index c0f3b37cfbf..b15a7d4c3cf 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -113,7 +113,7 @@ PKGS = [
     ('xsltproc', 'libxslt'),
     ('krb5-user', ''),
     ('krb5-config', ''),
-    ('', 'krb5-server'),
+    ('krb5-kdc', 'krb5-server'),
     ('apt-utils', 'yum-utils'),
     ('pkg-config', 'pkgconfig'),
     ('procps', 'procps-ng'),  # required for the free cmd in tests
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index a5cb63ace15..ac3ba7f399b 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 03862993de3..0611dd8475c 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 73db186c1d9..bddc4548016 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 7aaeb2a2f09..e0e5d53d5ea 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 7fa82c9f042..5e5a2fd43ed 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     libacl1-dev \
     libaio-dev \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 85736819f58..9fdb1d1c2e6 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - libacl1-dev
   - libaio-dev
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 478d7c9a0d6..c4e2da48220 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -32,6 +32,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index b796d0d2d37..854dfd863fb 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -21,6 +21,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 43c66be224b..356c59c808e 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -32,6 +32,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index b9c4cb0308c..b06d7efe985 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -21,6 +21,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 0defc9325b6..7a5dc23e62e 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -33,6 +33,7 @@ apt-get -y install \
     hostname \
     htop \
     krb5-config \
+    krb5-kdc \
     krb5-user \
     language-pack-en \
     libacl1-dev \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 6b3c00910c8..bbf8eb59640 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -22,6 +22,7 @@ packages:
   - hostname
   - htop
   - krb5-config
+  - krb5-kdc
   - krb5-user
   - language-pack-en
   - libacl1-dev
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index aa874cf24eb..a522f0566a6 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-14f5cb79a0fbeef9378506ecdc6881d8042736c9
+a63fcd17331238531d472206e34aa24c9fc46bb1