diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f4e269..144b541 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-28-libdrm"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-31-ntp"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 4f4609e..fdb1f58 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -41,6 +41,7 @@
     python3-pytest \
     python3-requests \
     python3-yaml \
+    sntp \
     wget \
     xz-utils
 
diff --git a/.gitlab-ci/generate_lava.py b/.gitlab-ci/generate_lava.py
index 6f887c5..66b8988 100755
--- a/.gitlab-ci/generate_lava.py
+++ b/.gitlab-ci/generate_lava.py
@@ -43,10 +43,6 @@
 values['env_vars'] = env_vars
 values['deqp_version'] = args.deqp_version
 
-# We need a sane date to check certificates, but don't want to wait to get
-# time from the network after boot.
-values['date'] = datetime.datetime.now().strftime("%Y%m%d %H%M")
-
 f = open(os.path.splitext(os.path.basename(args.template))[0], "w")
 f.write(template.render(values))
 f.close()
diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index 639f1d1..5ec3933 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -73,7 +73,7 @@
           - mkdir -p /dev/pts
           - mount -t devpts devpts /dev/pts
           - echo "nameserver 8.8.8.8" > /etc/resolv.conf
-          - date "+%Y%m%d %H%M" -s "{{ date }}"
+          - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
 
 
 {% if env_vars %}
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 7501d09..dd6b481 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-07-28-x86"
+  DISTRIBUTION_TAG: "2020-07-31-ntp-2"
 
 .kernel+rootfs:
   stage: container-2
diff --git a/.gitlab-ci/lava-tracie.yml.jinja2 b/.gitlab-ci/lava-tracie.yml.jinja2
index 0811c67..d0109bc 100644
--- a/.gitlab-ci/lava-tracie.yml.jinja2
+++ b/.gitlab-ci/lava-tracie.yml.jinja2
@@ -73,7 +73,7 @@
           - mkdir -p /dev/pts
           - mount -t devpts devpts /dev/pts
           - echo "nameserver 8.8.8.8" > /etc/resolv.conf
-          - date "+%Y%m%d %H%M" -s "{{ date }}"
+          - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
 
 
 {% if env_vars %}