diff --git a/changelog/changes/2024-04-24-azure-nvme-utils.md b/changelog/changes/2024-04-24-azure-nvme-utils.md
new file mode 100644
index 00000000000..58c46343ad4
--- /dev/null
+++ b/changelog/changes/2024-04-24-azure-nvme-utils.md
@@ -0,0 +1 @@
+- Added azure-nvme-utils to the image, which is used by udev to create symlinks for NVMe disks on Azure v6 instances under /dev/disk/azure/. ([scripts#1950](https://github.com/flatcar/scripts/pull/1950))
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest
new file mode 100644
index 00000000000..73a85d9db01
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest
@@ -0,0 +1 @@
+DIST azure-nvme-utils-0.0.0-1a1167d1d7780068d0af5afc3ad18a2601e951fe.zip 15473 BLAKE2B c57bc01b53bb52b0d958e6eac0d7df5b08023024dbf197f236229174fed2e8d295a4d66f123a2914f8ff11a70df83db7e7cafa56242a80c925bff53032b38b4e SHA512 48739a5da9e7fdba9c26df803354925ff508f4bb872f9dfde7461b6fec70648e1daaa7c1468960467d19243c6b3c871dd4bf060fa85e22f5576083d2a19385ed
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild
new file mode 100644
index 00000000000..4760df90c84
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2024 Flatcar Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+GIT_COMMIT="1a1167d1d7780068d0af5afc3ad18a2601e951fe"
+DESCRIPTION="Azure NVMe utilities"
+HOMEPAGE="https://github.com/Azure/azure-nvme-utils"
+SRC_URI="https://github.com/Azure/azure-nvme-utils/archive/${GIT_COMMIT}.zip -> ${P}-${GIT_COMMIT}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DVERSION="${PVR}-${GIT_COMMIT}"
+	)
+	cmake_src_configure
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-flatcar-changes.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-flatcar-changes.patch
index 9eeb4d12463..694ed8b9371 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-flatcar-changes.patch
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-flatcar-changes.patch
@@ -115,7 +115,7 @@ index 00000000..66eae16e
 +        # User 'core' is not a sysuser.
 +        if username == 'core':
 +            return False
-+        return super(CoreOSUtil, self).is_sys_user(username)
++        return super(CoreosCommonUtil, self).is_sys_user(username)
 +
 +    def is_dhcp_enabled(self):
 +        return True
@@ -172,7 +172,7 @@ new file mode 100644
 index 00000000..e31b2923
 --- /dev/null
 +++ b/azurelinuxagent/common/osutil/flatcar.py
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,80 @@
 +#
 +# Copyright 2023 Microsoft Corporation
 +#
@@ -240,6 +240,8 @@ index 00000000..e31b2923
 +        Restart an interface by bouncing the link. systemd-networkd observes
 +        this event, and forces a renew of DHCP.
 +        """
++        logger.info("not restarting interface {}".format(ifname))
++        return
 +        retry_limit = retries + 1
 +        for attempt in range(1, retry_limit):
 +            return_code = shellutil.run("ip link set {0} down && ip link set {0} up".format(ifname))
@@ -404,7 +406,7 @@ new file mode 100644
 index 00000000..d0d6f7c8
 --- /dev/null
 +++ b/init/flatcar/waagent.service
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,31 @@
 +[Unit]
 +Description=Microsoft Azure Linux Agent
 +Wants=network-online.target sshd.service sshd-keygen.service
@@ -419,6 +421,7 @@ index 00000000..d0d6f7c8
 +# /usr/share/flatcar/etc.
 +#
 +ExecStartPre=/bin/bash -c 'if [[ ! -e /etc/waagent.conf ]]; then ln -sf ../usr/share/waagent/waagent.conf /etc/waagent.conf; fi'
++ExecStartPre=/bin/bash -c 'if [[ ! -e /oem/waagent.conf ]]; then ln -sf /etc/waagent.conf /oem/waagent.conf; fi'
 +
 +# This could be done also with:
 +#
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.9.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.9.1.1-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.9.1.1-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.9.1.1-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index 67d4fc6e02c..46abd796a81 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -80,6 +80,7 @@ RDEPEND="${RDEPEND}
 
 # sys-devel/gettext: it embeds 'envsubst' binary which is useful for simple file templating.
 RDEPEND="${RDEPEND}
+	app-admin/azure-nvme-utils
 	app-admin/etcd-wrapper
 	app-admin/flannel-wrapper
 	app-admin/locksmith