diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index b0fe394d9..90c3a51d2 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -170,6 +170,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdClearColorImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdExecuteCommands)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPushConstants)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPushDescriptorSetKHR)
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetViewport)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetScissor)
diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 95f128e5b..5b01da407 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -64,7 +64,6 @@ typedef struct bspframe_s {
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
-	VkDescriptorSet descriptors;
 } bspframe_t;
 
 typedef struct bspframeset_s
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index aa60ec958..fee54e446 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -63,20 +63,6 @@
 				},
 			);
 		};
-		quakebsp = {
-			flags = 0;
-			maxSets = $framebuffers.size;
-			bindings = (
-				{
-					type = uniform_buffer;
-					descriptorCount = $framebuffers.size;
-				},
-				{
-					type = combined_image_sampler;
-					descriptorCount = "5z * $framebuffers.size";
-				},
-			);
-		};
 	};
 	setLayouts = {
 		twod = {
@@ -96,6 +82,7 @@
 			);
 		};
 		quakebsp = {
+			flags = push_descriptor;
 			bindings = (
 				{
 					binding = 0;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index d60f95bb5..5d7c9efc2 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -831,32 +831,31 @@ bsp_begin (vulkan_ctx_t *ctx)
 		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
 	};
 	VkWriteDescriptorSet write[] = {
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 0, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  0, 0, 1,
 		  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
 		  0, &bufferInfo, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 1, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  1, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[0], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 2, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  2, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[1], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 3, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  3, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[2], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 4, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  4, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[3], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 5, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  5, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[4], 0, 0 },
 	};
-	dfunc->vkUpdateDescriptorSets (device->dev, 5, write, 0, 0);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
@@ -884,10 +883,8 @@ bsp_begin (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
 								 VK_INDEX_TYPE_UINT32);
 
-	VkDescriptorSet set = bframe->descriptors;
-	VkPipelineLayout layout = bctx->layout;
-	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									layout, 0, 1, &set, 0, 0);
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  bctx->layout, 0, 5, write);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -1296,20 +1293,16 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < layouts->size; i++) {
 		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "quakebsp");
 	}
-	__auto_type pool = QFV_GetDescriptorPool (ctx, "quakebsp");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
-	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type bframe = &bctx->frames.a[i];
-		bframe->descriptors = sets->a[i];
 		bframe->bsp_cmd = cmdBuffers->a[i];
 		bframe->turb_cmd = cmdBuffers->a[i];
 		bframe->sky_cmd = cmdBuffers->a[i];
 	}
-	free (sets);
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 3d317f52c..d9220307b 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -132,11 +132,13 @@ Vulkan_Init_Cvars (void)
 
 static const char *instance_extensions[] = {
 	VK_KHR_SURFACE_EXTENSION_NAME,
+	VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
 	0,
 };
 
 static const char *device_extensions[] = {
 	VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+	VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME,
 	0,
 };