diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd745ae44..d47903aa7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,11 +59,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-29ef9f73ce6e'
-  CENTOS_TAG:  'tag-db8e32949a26'
-  DEBIAN_TAG:  'tag-67262330bdf8'
-  FEDORA_TAG:  'tag-db8e32949a26'
-  UBUNTU_TAG:  'tag-67262330bdf8'
+  ALPINE_TAG:  'tag-ed94fd969369'
+  CENTOS_TAG:  'tag-dc93a9c129f8'
+  DEBIAN_TAG:  'tag-3766b6cf1e7d'
+  FEDORA_TAG:  'tag-dc93a9c129f8'
+  UBUNTU_TAG:  'tag-3766b6cf1e7d'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -635,7 +635,7 @@ check-tree:
     - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
     - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
-    - date '+%Y%m%d-%H%M%S'; ./autogen.sh && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
+    - date '+%Y%m%d-%H%M%S'; ./autogen.sh --disable-autotools-deprecation && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
 
 pages:
   stage: deploy
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 9d8045747..28e4ca25e 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -222,7 +222,7 @@ check-tree:
     - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
     - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
-    - date '+%Y%m%d-%H%M%S'; ./autogen.sh && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
+    - date '+%Y%m%d-%H%M%S'; ./autogen.sh --disable-autotools-deprecation && [ "$(LANG=C make -C po update-po 2>&1 1>/dev/null | grep -c 'warning:')" = 0 ]
 
 pages:
   stage: deploy
diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh
index e385ef1e8..162b9da18 100755
--- a/contrib/scripts/nm-ci-run.sh
+++ b/contrib/scripts/nm-ci-run.sh
@@ -188,6 +188,7 @@ run_autotools() {
             \
             --enable-ifcfg-rh=yes \
             --enable-ifupdown=yes \
+            --disable-autotools-deprecation \
             \
             #end