diff --git a/src/panfrost/drm-shim/panfrost_noop.c b/src/panfrost/drm-shim/panfrost_noop.c
index d375964464d..228123d9d81 100644
--- a/src/panfrost/drm-shim/panfrost_noop.c
+++ b/src/panfrost/drm-shim/panfrost_noop.c
@@ -30,6 +30,7 @@
 #include "drm-uapi/panfrost_drm.h"
 #include "drm-uapi/panthor_drm.h"
 
+#include "util/os_misc.h"
 #include "util/os_mman.h"
 #include "util/u_math.h"
 
@@ -41,7 +42,7 @@ bool drm_shim_driver_prefers_first_render_node = true;
 static uint64_t
 pan_get_gpu_id(void)
 {
-   char *override_version = getenv("PAN_GPU_ID");
+   const char *override_version = os_get_option("PAN_GPU_ID");
 
    if (override_version)
       return strtol(override_version, NULL, 16);
diff --git a/src/panfrost/vulkan/csf/panvk_vX_utrace.c b/src/panfrost/vulkan/csf/panvk_vX_utrace.c
index ca2ba1e7575..0627d1e7433 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_utrace.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_utrace.c
@@ -6,6 +6,8 @@
 
 #include "panvk_utrace.h"
 
+#include "util/os_misc.h"
+
 #include "drm-uapi/panthor_drm.h"
 
 #include "genxml/cs_builder.h"
@@ -168,7 +170,7 @@ panvk_utrace_capture_data(struct u_trace *ut, void *cs, void *dst_buffer,
 static uint32_t
 get_utrace_clone_mem_size()
 {
-   const char *v = getenv("PANVK_UTRACE_CLONE_MEM_SIZE");
+   const char *v = os_get_option("PANVK_UTRACE_CLONE_MEM_SIZE");
    if (v) {
       uint32_t size = 0;
       sscanf(v, "%u", &size);
diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c
index 9169428dd74..db8c335aa16 100644
--- a/src/panfrost/vulkan/panvk_instance.c
+++ b/src/panfrost/vulkan/panvk_instance.c
@@ -12,6 +12,7 @@
 #include "util/build_id.h"
 #include "util/driconf.h"
 #include "util/mesa-sha1.h"
+#include "util/os_misc.h"
 
 #include "vk_alloc.h"
 #include "vk_log.h"
@@ -244,7 +245,7 @@ panvk_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
    instance->vk.physical_devices.destroy = panvk_destroy_physical_device;
 
    instance->debug_flags =
-      parse_debug_string(getenv("PANVK_DEBUG"), panvk_debug_options);
+      parse_debug_string(os_get_option("PANVK_DEBUG"), panvk_debug_options);
 
    if (instance->debug_flags & PANVK_DEBUG_STARTUP)
       vk_logi(VK_LOG_NO_OBJS(instance), "Created an instance");
diff --git a/src/panfrost/vulkan/panvk_physical_device.c b/src/panfrost/vulkan/panvk_physical_device.c
index a366ca1c8e6..48b79970f7f 100644
--- a/src/panfrost/vulkan/panvk_physical_device.c
+++ b/src/panfrost/vulkan/panvk_physical_device.c
@@ -13,6 +13,7 @@
 #include <sys/sysinfo.h>
 
 #include "util/disk_cache.h"
+#include "util/os_misc.h"
 #include "git_sha1.h"
 
 #include "vk_android.h"
@@ -268,7 +269,7 @@ panvk_physical_device_init(struct panvk_physical_device *device,
    switch (arch) {
    case 6:
    case 7:
-      if (!getenv("PAN_I_WANT_A_BROKEN_VULKAN_DRIVER")) {
+      if (!os_get_option("PAN_I_WANT_A_BROKEN_VULKAN_DRIVER")) {
          result = panvk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER,
                                "WARNING: panvk is not well-tested on v%d, "
                                "pass PAN_I_WANT_A_BROKEN_VULKAN_DRIVER=1 "