diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile
index c855b14cefe4..03ed912e158b 100644
--- a/graphics/vulkan-extension-layer/Makefile
+++ b/graphics/vulkan-extension-layer/Makefile
@@ -1,19 +1,25 @@
 PORTNAME=	vulkan-extension-layer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.224
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Layer providing Vulkan features when native support is unavailable
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 USES=		cmake compiler:c++11-lib
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ExtensionLayer
 
+.if ${DISTVERSION:E} < 225
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.224:vkheaders/Vulkan-Headers
+CMAKE_ARGS+=	-DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}"
+CFLAGS+=	-isystem${LOCALBASE}/include
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo
index 61c3924b04bf..84b8527ef930 100644
--- a/graphics/vulkan-extension-layer/distinfo
+++ b/graphics/vulkan-extension-layer/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1659725419
 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.224_GH0.tar.gz) = 740c96b52d8187334158ad9554163de279c96763524cd65ef5044cf9b362a3fb
 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.224_GH0.tar.gz) = 481520
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 8829272058455c6ba393df66b9fac3ae3617eb0df48c860e225ceb1622fa7700
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 1521224
diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index 3f84293cec0d..db1b98f11f3a 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.224
+DISTVERSION=	1.3.225
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Headers for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Headers
 STRIP=		# nothing to strip
 NO_ARCH=	yes
 
 post-patch:
 # XXX Drop after FreeBSD 12.* EOL around 2024-06-30
 	@if [ -L /usr/include/sched.h ]; then \
 		${REINPLACE_CMD} $$'/^namespace/i\\\n#undef major\\\n#undef minor\\\n\\\n' \
 			${WRKSRC}/include/vulkan/vulkan_structs.hpp; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index e973bb567eea..46c11c742b5e 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659603156
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 8829272058455c6ba393df66b9fac3ae3617eb0df48c860e225ceb1622fa7700
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 1521224
+TIMESTAMP = 1660821713
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.225_GH0.tar.gz) = 71bfa18ef3df0c39b1dc194727166e4ec1c51df7254ac86e0b9c27fd10cf85ad
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.225_GH0.tar.gz) = 1521839
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index f60f0d6f1860..287fd72e7cd3 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,51 +1,56 @@
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.224
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Driver loader for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 USES=		alias cmake compiler:c++11-lib pkgconfig python:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Loader
 CMAKE_ON=	CMAKE_SKIP_RPATH
 CMAKE_OFF=	BUILD_TESTS
 
+.if ${DISTVERSION:E} < 225
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.224:vkheaders/external/Vulkan-Headers
+CFLAGS+=	-isystem${LOCALBASE}/include
+.endif
+
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
 XCB_DESC=		${X11_DESC} via libxcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
 
 XLIB_DESC=		${X11_DESC} via libX11
 XLIB_USES=		xorg
 XLIB_USE=		XORG=x11,xrandr
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 post-patch:
 # Extract (snapshot) version from the port
 # Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset
 	@${REINPLACE_CMD} -e '/find_.*Git/d' \
 		-e '/BRANCH/s/--unknown--/main/' \
 		-e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \
 		-e '/FALLBACK/s,/etc,${PREFIX}&,' \
 		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/CMakeLists.txt
 # https://github.com/llvm/llvm-project/issues/46692
 	@if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \
 		${ECHO} "disabled" >${WRKSRC}/loader/asm_test_x86.S; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo
index 9273e706f4f5..cdf954f26ca5 100644
--- a/graphics/vulkan-loader/distinfo
+++ b/graphics/vulkan-loader/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1659645131
 SHA256 (KhronosGroup-Vulkan-Loader-v1.3.224_GH0.tar.gz) = 702a974c460c668a9469a4614aed0b06602e5031154a67bc195429f4604bf51e
 SIZE (KhronosGroup-Vulkan-Loader-v1.3.224_GH0.tar.gz) = 1595042
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 8829272058455c6ba393df66b9fac3ae3617eb0df48c860e225ceb1622fa7700
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 1521224
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index e3dbbd79711e..ebec6938100d 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -1,61 +1,67 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.224
 CATEGORIES=	graphics wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools and demos for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 USES=		alias cmake compiler:c++11-lib pkgconfig python:3.4+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Tools
 CMAKE_OFF=	BUILD_CUBE BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
+.if ${DISTVERSION:E} < 225
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.224:vkheaders/Vulkan-Headers
+CMAKE_ARGS+=	-DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}"
+CFLAGS+=	-isystem${LOCALBASE}/include
+.endif
+
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
 OPTIONS_SLAVE=		DISPLAY
 OPTIONS_SUB=		yes
 
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
 XCB_DESC=		${X11_DESC} via libxcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
 
 XLIB_DESC=		${X11_DESC} via libX11
 XLIB_USES=		xorg
 XLIB_USE=		XORG=x11,xext,ice,sm
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 # https://github.com/KhronosGroup/Vulkan-Tools/issues/307
 .for _wsi in display wayland xcb xlib
 do-configure-${_wsi:tu}-on: ${_wsi}-configure
 ${_wsi}-configure:
 	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \
 		-DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \
 		-DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \
 		-B${CONFIGURE_WRKSRC}-${_wsi}
 do-build-${_wsi:tu}-on: ${_wsi}-build
 ${_wsi}-build:
 	@${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi}
 do-install-${_wsi:tu}-on: ${_wsi}-install
 ${_wsi}-install:
 . for _file in vkcube vkcubepp
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \
 		${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi}
 . endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 93e06a0e56f7..dc92eae06c2a 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1659649398
 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.224_GH0.tar.gz) = ba984b6777364dadf9dd995efa3f0e38781184a95cef940e4169a37597d28d51
 SIZE (KhronosGroup-Vulkan-Tools-v1.3.224_GH0.tar.gz) = 868370
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 8829272058455c6ba393df66b9fac3ae3617eb0df48c860e225ceb1622fa7700
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 1521224
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index ebe14f0965e4..d3635db63447 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,43 +1,49 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.224
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Validation layers for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
 		vulkan-headers>0:graphics/vulkan-headers
 
 USES=		alias cmake compiler:c++11-lib pkgconfig python:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-168-g5a12186:headers/external/spirv-headers \
 		martinus:robin-hood-hashing:3.11.5:robin_hood/external/robin-hood-hashing
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DROBIN_HOOD_HASHING_INSTALL_DIR:PATH="${WRKSRC_robin_hood}" \
 		-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
 CFLAGS+=	${WITH_DEBUG:U-DNDEBUG}
 
+.if ${DISTVERSION:E} < 225
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.224:vkheaders/Vulkan-Headers
+CMAKE_ARGS+=	-DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}"
+CFLAGS+=	-isystem${LOCALBASE}/include
+.endif
+
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
 XCB_DESC=		${X11_DESC} via libxcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
 
 XLIB_DESC=		${X11_DESC} via libX11
 XLIB_USES=		xorg
 XLIB_USE=		XORG=x11,xrandr
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index c6b7c6f1e79b..41edd5707e0e 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,7 +1,9 @@
 TIMESTAMP = 1659654840
 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.224_GH0.tar.gz) = 8dfda3ca5e214bd9050f06420602a671af170b58034368913b5b3bda9bf84c0f
 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.224_GH0.tar.gz) = 4115291
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-168-g5a12186_GH0.tar.gz) = a066e63d5e85f221580e3e1e25e80af040f195ea3e02ec68bb3665bdfba3fc58
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-168-g5a12186_GH0.tar.gz) = 436631
 SHA256 (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0
 SIZE (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 177134
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 8829272058455c6ba393df66b9fac3ae3617eb0df48c860e225ceb1622fa7700
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.224_GH0.tar.gz) = 1521224