diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 9d8fd93f20..0462ba2214 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -236,7 +236,7 @@ target_openssl()
 
 target_bullet()
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 add_crashpad()
 target_breakpad()
diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt
index 07b70c310f..2a0da40b71 100644
--- a/libraries/display-plugins/CMakeLists.txt
+++ b/libraries/display-plugins/CMakeLists.txt
@@ -13,7 +13,7 @@ include_hifi_library_headers(ktx)
 include_hifi_library_headers(render)
 include_hifi_library_headers(procedural)
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 
 GroupSources("src/display-plugins")
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index 4e3d7ca16c..f0eec1da9f 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -2,6 +2,6 @@ set(TARGET_NAME gl)
 setup_hifi_library(Gui Widgets)
 link_hifi_libraries(shared)
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 
diff --git a/libraries/gpu-gl-common/CMakeLists.txt b/libraries/gpu-gl-common/CMakeLists.txt
index eec135e8fe..6bd98a45d0 100644
--- a/libraries/gpu-gl-common/CMakeLists.txt
+++ b/libraries/gpu-gl-common/CMakeLists.txt
@@ -3,6 +3,6 @@ setup_hifi_library(Concurrent)
 link_hifi_libraries(shared gl gpu shaders)
 GroupSources("src")
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 
diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt
index de651e5116..5797fb5172 100644
--- a/libraries/gpu-gl/CMakeLists.txt
+++ b/libraries/gpu-gl/CMakeLists.txt
@@ -6,6 +6,6 @@ if (UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
 endif(UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
 GroupSources("src")
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 
diff --git a/libraries/qml/CMakeLists.txt b/libraries/qml/CMakeLists.txt
index 3d53191720..b59b65824d 100644
--- a/libraries/qml/CMakeLists.txt
+++ b/libraries/qml/CMakeLists.txt
@@ -3,5 +3,5 @@ setup_hifi_library(Multimedia Network Qml Quick WebChannel WebSockets ${PLATFORM
 link_hifi_libraries(shared networking gl)
 
 # Required for some low level GL interaction in the OffscreenQMLSurface
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt
index 3625bd4f3e..6dde4cc1a2 100644
--- a/libraries/ui/CMakeLists.txt
+++ b/libraries/ui/CMakeLists.txt
@@ -4,5 +4,5 @@ link_hifi_libraries(shared networking qml gl audio audio-client plugins pointers
 include_hifi_library_headers(controllers)
 
 # Required for some low level GL interaction in the OffscreenQMLSurface
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
diff --git a/tools/gpu-frame-player/CMakeLists.txt b/tools/gpu-frame-player/CMakeLists.txt
index e3611e1068..3f5330c381 100644
--- a/tools/gpu-frame-player/CMakeLists.txt
+++ b/tools/gpu-frame-player/CMakeLists.txt
@@ -23,7 +23,7 @@ link_hifi_libraries(
 
 target_compile_definitions(${TARGET_NAME} PRIVATE USE_GL)
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 #target_vulkan()