diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3c36ed81..b6acd6fb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
-  ALPINE_TAG:  'tag-77ec3d923fd6'
-  CENTOS_TAG:  'tag-7a677f4838e1'
-  DEBIAN_TAG:  'tag-ecad19904683'
-  FEDORA_TAG:  'tag-7a677f4838e1'
-  UBUNTU_TAG:  'tag-ecad19904683'
+  ALPINE_TAG:  'tag-57edf560bf4f'
+  CENTOS_TAG:  'tag-7ea4f50c8578'
+  DEBIAN_TAG:  'tag-1601ce2572c5'
+  FEDORA_TAG:  'tag-7ea4f50c8578'
+  UBUNTU_TAG:  'tag-1601ce2572c5'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
   CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
diff --git a/contrib/alpine/REQUIRED_PACKAGES b/contrib/alpine/REQUIRED_PACKAGES
index 358214fd0..6f0e86fdd 100755
--- a/contrib/alpine/REQUIRED_PACKAGES
+++ b/contrib/alpine/REQUIRED_PACKAGES
@@ -24,6 +24,7 @@ apk add \
     'jansson-dev' \
     'libgudev-dev' \
     'libndp-dev' \
+    'libnvme-dev' \
     'libnl3-dev' \
     'libpsl-dev' \
     'libsoup-dev' \
diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES
index fa73b21ad..d91e54d27 100755
--- a/contrib/debian/REQUIRED_PACKAGES
+++ b/contrib/debian/REQUIRED_PACKAGES
@@ -56,6 +56,7 @@ install \
     libndp-dev \
     libnewt-dev \
     libnss3-dev \
+    libnvme-dev \
     libpolkit-gobject-1-dev \
     libpsl-dev \
     libreadline-dev \
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES
index 1bb7ec6b3..38a2cbbf4 100755
--- a/contrib/fedora/REQUIRED_PACKAGES
+++ b/contrib/fedora/REQUIRED_PACKAGES
@@ -66,6 +66,7 @@ install \
     jq \
     libcurl-devel \
     libndp-devel \
+    libnvme-devel \
     libselinux-devel \
     libtool \
     libuuid-devel \
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 638da502d..788e9ead5 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -307,6 +307,7 @@ BuildRequires: libubsan
 BuildRequires: firewalld-filesystem
 BuildRequires: iproute
 BuildRequires: iproute-tc
+BuildRequires: libnvme-devel >= 1.5
 
 Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
 
diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh
index 3864620f8..4881d110d 100755
--- a/contrib/scripts/nm-ci-run.sh
+++ b/contrib/scripts/nm-ci-run.sh
@@ -54,10 +54,15 @@ _WITH_WERROR=1
 _WITH_LIBTEAM="true"
 _WITH_DOCS="true"
 _WITH_SYSTEMD_LOGIND="true"
+_WITH_NBFT="true"
 if [ $IS_ALPINE = 1 ]; then
     _WITH_SYSTEMD_LOGIND="false"
 fi
 
+if ! pkgconf 'libnvme >= 1.5'; then
+    _WITH_NBFT="false"
+fi
+
 if [ -z "${NMTST_SEED_RAND+x}" ]; then
     NMTST_SEED_RAND="$SRANDOM"
     if [ -z "$NMTST_SEED_RAND" ]; then
@@ -181,6 +186,8 @@ meson setup build \
     -D ifcfg_rh=false \
     -D ifupdown=true \
     \
+    -D nbft=$_WITH_NBFT \
+    \
     #end
 
 export NM_TEST_CLIENT_CHECK_L10N=1
diff --git a/tools/nm-in-container b/tools/nm-in-container
index 0e3f31da7..365b8fcf8 100755
--- a/tools/nm-in-container
+++ b/tools/nm-in-container
@@ -224,6 +224,7 @@ RUN dnf install -y \\
     libasan \\
     libcurl-devel \\
     libndp-devel \\
+    libnvme-devel \\
     libpsl-devel \\
     libselinux-devel \\
     libtool \\