diff --git a/sysutils/zot/Makefile b/sysutils/zot/Makefile
index 389f32e85a0f..fcf2652f31c1 100644
--- a/sysutils/zot/Makefile
+++ b/sysutils/zot/Makefile
@@ -1,48 +1,47 @@
 PORTNAME=	zot
 DISTVERSIONPREFIX=v
-DISTVERSION=	2.1.17
-PORTREVISION=	1
+DISTVERSION=	2.1.18
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/project-zot/zui/releases/download/commit-${ZUI_VERSION}/:ui
 DISTFILES=	zui.tgz:ui
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Production ready and vendor neutral OCI image registry
 WWW=		https://zotregistry.dev/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	modernc.org/libc does not compile on i386
 
-USES=		go:1.25+,modules
+USES=		go:1.26+,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	project-zot
 
-ZUI_VERSION=	9333420
+ZUI_VERSION=	89a04ea
 
 GO_MODULE=	zotproject.dev/zot
 GO_MOD_DIST=	https://raw.githubusercontent.com/project-zot/zot/refs/tags/v${DISTVERSION}/
 GO_TARGET=	./cmd/zot
 GO_ENV+=	GOEXPERIMENT=jsonv2
 GO_BUILDFLAGS=	-ldflags " \
 		-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=${DISTVERSION} \
 		-X zotregistry.dev/zot/pkg/api/config.BinaryType=full \
 		-X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION}" \
 		-tags sync,search,scrub,metrics,lint,ui,mgmt,profile,userprefs,imagetrust,events,search,mgmt,userprefs
 
 USE_RC_SUBR=	zot
 
 PLIST_FILES=	bin/zot \
 		etc/zot/config-minimal.json.sample \
 		etc/zot/config-ui.json.sample
 
 post-extract:
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/zui.tgz -C ${WRKSRC}/pkg/extensions
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${PATCHDIR}/config-minimal.json ${STAGEDIR}${ETCDIR}/config-minimal.json.sample
 	${INSTALL_DATA} ${PATCHDIR}/config-ui.json ${STAGEDIR}${ETCDIR}/config-ui.json.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/zot/distinfo b/sysutils/zot/distinfo
index 8b8be44abac6..77b6000e255e 100644
--- a/sysutils/zot/distinfo
+++ b/sysutils/zot/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1779303617
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/zui.tgz) = b8da52b73c5f5d4c976e6938ca373fac59f78204dd5105412c45f720b3a653b2
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/zui.tgz) = 1092572
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/go.mod) = b059f3cdbeeaff0ba3aeb233f3b16d8114bfdd684af11a2b02408771768ae6c9
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/go.mod) = 31058
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/project-zot-zot-v2.1.17_GH0.tar.gz) = c182a648655f1a1e0c38814235767133dd2217e0cb3372c8b017e940c29597a1
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.17_GH0/project-zot-zot-v2.1.17_GH0.tar.gz) = 1463098
+TIMESTAMP = 1782373027
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/zui.tgz) = 47517fd4a60786025a77f707e2351b44303c2f0bf04d381ab2fd20a800d4f307
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/zui.tgz) = 1131442
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/go.mod) = 7386b0262910ed5a23aad0d53cad0a3e2ecb1b413c676c1d46e1c3051db8232a
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/go.mod) = 31373
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/project-zot-zot-v2.1.18_GH0.tar.gz) = 74fb3e358bd92ac3f74d5fdcd8841f842428d23593ca6a8f86ae4b734d1a8a37
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.18_GH0/project-zot-zot-v2.1.18_GH0.tar.gz) = 1506029