diff --git a/projects/RPi/devices/RPi4/options b/projects/RPi/devices/RPi4/options
index f64c39afc8..598d57c6bc 100644
--- a/projects/RPi/devices/RPi4/options
+++ b/projects/RPi/devices/RPi4/options
@@ -10,8 +10,3 @@
 
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
     FIRMWARE="${FIRMWARE} rpi-eeprom"
-
-    OPENGLES="mesa"
-    GRAPHIC_DRIVERS="vc4"
-    KODIPLAYER_DRIVER="mesa"
-    KODI_VENDOR="default"
diff --git a/projects/RPi/options b/projects/RPi/options
index 338db45057..53335e6ee9 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -74,7 +74,7 @@
     OPENGL="no"
 
   # OpenGL-ES implementation to use (no / bcm2835-driver / mesa)
-    OPENGLES="bcm2835-driver"
+    OPENGLES="mesa"
 
   # Displayserver to use (x11 / no)
     DISPLAYSERVER="no"
@@ -85,13 +85,13 @@
   # Xorg Graphic drivers to use (all / vc4 / none)
   # Space separated list is supported,
   # e.g. GRAPHIC_DRIVERS="vc4"
-    GRAPHIC_DRIVERS=""
+    GRAPHIC_DRIVERS="vc4"
 
   # Use a vendor specific KODI repo
     KODI_VENDOR="default"
 
   # KODI Player implementation to use (default / bcm2835-driver / mesa)
-    KODIPLAYER_DRIVER="bcm2835-driver"
+    KODIPLAYER_DRIVER="mesa"
 
   # use the kernel CEC framework for libcec (yes / no)
     CEC_FRAMEWORK_SUPPORT="yes"