diff --git a/meson.build b/meson.build
index b72c3ec50d8..01604867961 100644
--- a/meson.build
+++ b/meson.build
@@ -242,7 +242,7 @@ elif _vulkan_drivers.contains('all')
    _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast',
                       'freedreno', 'panfrost', 'virtio', 'broadcom',
                       'imagination-experimental', 'microsoft-experimental',
-                      'nouveau', 'asahi', 'gfxstream-experimental']
+                      'nouveau', 'asahi', 'gfxstream']
 endif
 
 with_intel_vk = _vulkan_drivers.contains('intel')
@@ -258,7 +258,7 @@ with_imagination_srv = get_option('imagination-srv')
 with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental')
 with_nouveau_vk = _vulkan_drivers.contains('nouveau')
 with_asahi_vk = _vulkan_drivers.contains('asahi')
-with_gfxstream_vk = _vulkan_drivers.contains('gfxstream-experimental')
+with_gfxstream_vk = _vulkan_drivers.contains('gfxstream')
 with_any_vk = _vulkan_drivers.length() != 0
 
 if with_any_vk and host_machine.system() == 'windows' and meson.version().version_compare('< 1.3')
diff --git a/meson_options.txt b/meson_options.txt
index bc29efd6a01..42e819dacd2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -205,8 +205,8 @@ option(
   value : ['auto'],
   choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk',
              'panfrost', 'swrast', 'virtio', 'imagination-experimental',
-             'microsoft-experimental', 'nouveau', 'asahi',
-             'gfxstream-experimental', 'all'],
+             'microsoft-experimental', 'nouveau', 'asahi', 'gfxstream',
+             'all'],
   description : 'List of vulkan drivers to build. If this is set to auto ' +
                 'all drivers applicable to the target OS/architecture ' +
                 'will be built'