diff --git a/docs/features.txt b/docs/features.txt
index 4021d251637..1b9f446a59c 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -426,8 +426,8 @@ Vulkan 1.1 -- all DONE: anv, lvp, nvk, radv, tu, vn
   VK_KHR_bind_memory2                                   DONE (anv, dzn, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_dedicated_allocation                           DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_descriptor_update_template                     DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn)
-  VK_KHR_device_group                                   DONE (anv, dzn, hasvk, lvp, nvk, tu, v3dv, vn)
-  VK_KHR_device_group_creation                          DONE (anv, hasvk, nvk, dzn, lvp, tu, v3dv, vn)
+  VK_KHR_device_group                                   DONE (anv, dzn, hasvk, lvp, nvk, panvk, tu, v3dv, vn)
+  VK_KHR_device_group_creation                          DONE (anv, hasvk, nvk, panvk, dzn, lvp, tu, v3dv, vn)
   VK_KHR_external_fence                                 DONE (anv, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_external_fence_capabilities                    DONE (anv, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_external_memory                                DONE (anv, dzn, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
diff --git a/src/panfrost/compiler/bifrost_compile.h b/src/panfrost/compiler/bifrost_compile.h
index 5473ae075cf..5d1fd1ada18 100644
--- a/src/panfrost/compiler/bifrost_compile.h
+++ b/src/panfrost/compiler/bifrost_compile.h
@@ -94,6 +94,7 @@ void bifrost_compile_shader_nir(nir_shader *nir,
                                                                                \
       .has_cs_global_id = true,                                                \
       .lower_cs_local_index_to_id = true,                                      \
+      .lower_device_index_to_zero = true,                                      \
       .max_unroll_iterations = 32,                                             \
       .force_indirect_unrolling =                                              \
          (nir_var_shader_in | nir_var_shader_out | nir_var_function_temp),     \
diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c
index c6cb9882509..a71a8de5b95 100644
--- a/src/panfrost/vulkan/panvk_instance.c
+++ b/src/panfrost/vulkan/panvk_instance.c
@@ -50,6 +50,7 @@ panvk_EnumerateInstanceVersion(uint32_t *pApiVersion)
 }
 
 static const struct vk_instance_extension_table panvk_instance_extensions = {
+   .KHR_device_group_creation = true,
    .KHR_get_physical_device_properties2 = true,
    .EXT_debug_report = true,
    .EXT_debug_utils = true,
diff --git a/src/panfrost/vulkan/panvk_physical_device.c b/src/panfrost/vulkan/panvk_physical_device.c
index fb184b26ba2..03bd2fa44ab 100644
--- a/src/panfrost/vulkan/panvk_physical_device.c
+++ b/src/panfrost/vulkan/panvk_physical_device.c
@@ -65,6 +65,7 @@ get_device_extensions(const struct panvk_physical_device *device,
    *ext = (struct vk_device_extension_table){
       .KHR_buffer_device_address = true,
       .KHR_copy_commands2 = true,
+      .KHR_device_group = true,
       .KHR_shader_expect_assume = true,
       .KHR_storage_buffer_storage_class = true,
       .KHR_descriptor_update_template = true,