diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index d87378886662..971e3415c02f 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -1,57 +1,56 @@
 PORTNAME=	azure-agent
-PORTVERSION=	2.8.0.11
-PORTREVISION=	1
+PORTVERSION=	2.12.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	weh@microsoft.com
 COMMENT=	Microsoft Azure Linux Agent
 WWW=		https://github.com/Azure/WALinuxAgent/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	sudo:security/sudo \
 		bash:shells/bash \
 		dmidecode:sysutils/dmidecode \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss
 
 NO_BUILD=	yes
 USES=		python shebangfix
 
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Azure
 GH_PROJECT=	WALinuxAgent
 USE_PYTHON=	autoplist distutils noflavors
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 		${WRKSRC}/azurelinuxagent/common/osutil/default.py
 	${REINPLACE_CMD} -e "s,/etc/rc.d/waagent,${PREFIX}/etc/rc.d/waagent,g" \
 			 -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,#!/usr/bin/env python,#!${PYTHON_CMD},g" \
 			 -e "/command_interpreter/ s,/usr/local/bin/python,${PYTHON_CMD}," \
 			 -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \
 		${WRKSRC}/bin/waagent2.0
 	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
 			 -e "s,python,${PYTHON_CMD},g" \
 		${WRKSRC}/init/freebsd/waagent
 	${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,/usr/bin/python,${PYTHON_CMD},g" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent.service
 	${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \
 			 -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/setup.py
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/config/freebsd/waagent.conf \
 		${STAGEDIR}${PREFIX}/etc/waagent.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/azure-agent/distinfo b/sysutils/azure-agent/distinfo
index a98313cdf8e8..ea34370637e4 100644
--- a/sysutils/azure-agent/distinfo
+++ b/sysutils/azure-agent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671076332
-SHA256 (Azure-WALinuxAgent-v2.8.0.11_GH0.tar.gz) = dbb36994d1df610943cd49609a49bf4ec6524520d88709891d282cec3607a31b
-SIZE (Azure-WALinuxAgent-v2.8.0.11_GH0.tar.gz) = 1576330
+TIMESTAMP = 1733935955
+SHA256 (Azure-WALinuxAgent-v2.12.0.2_GH0.tar.gz) = e7a2507c7815d6ad49227c6dd4259949ae01efbfd8ccd7bf8e79bdf051851fb0
+SIZE (Azure-WALinuxAgent-v2.12.0.2_GH0.tar.gz) = 2144003
diff --git a/sysutils/azure-agent/files/patch-azurelinuxagent_common_utils_textutil.py b/sysutils/azure-agent/files/patch-azurelinuxagent_common_utils_textutil.py
deleted file mode 100644
index 259f5a052c59..000000000000
--- a/sysutils/azure-agent/files/patch-azurelinuxagent_common_utils_textutil.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- azurelinuxagent/common/utils/textutil.py.orig	2024-08-20 23:23:16 UTC
-+++ azurelinuxagent/common/utils/textutil.py
-@@ -445,7 +445,7 @@ def format_exception(exception):
-     if tb is None or (sys.version_info[0] == 2 and e != exception):
-         msg += "[Traceback not available]"
-     else:
--        msg += ''.join(traceback.format_exception(etype=type(exception), value=exception, tb=tb))
-+        msg += ''.join(traceback.format_exception(type(exception), value=exception, tb=tb))
- 
-     return msg
-