diff --git a/init.redroid.rc b/init.redroid.rc
index e9bf15b..6750dce 100644
--- a/init.redroid.rc
+++ b/init.redroid.rc
@@ -1,10 +1,9 @@
 on early-init
+    mount debugfs debugfs /sys/kernel/debug mode=755
+
     mount none /system/etc /etc bind rec  # docker fix
     mount sysfs sysfs /sys rw remount  # ueventd fix
 
-    write /data/.empty 0
-    mount none /data/.empty /proc/vmallocinfo bind # lxcfs?
-
     # Mount binderfs
     mkdir /dev/binderfs
     mount binder binder /dev/binderfs stats=global
@@ -18,10 +17,25 @@ on early-init
     chmod 0666 /dev/binderfs/binder
     chmod 0666 /dev/binderfs/vndbinder
 
-    # fix for WSL2
+    # inputflinger require this dir
     mkdir /dev/input
 
-    setprop gralloc.gbm.device /dev/dri/renderD128
+    exec - root root -- /vendor/bin/gpu_config.sh
+
+
+# setup overlay data partition
+on early-init && property:ro.kernel.redroid.overlay=1
+    mkdir /data-diff/upper
+    rmdir /data-diff/work
+    mkdir /data-diff/work
+
+    mount overlay overlay /data lowerdir=/data-base,upperdir=/data-diff/upper,workdir=/data-diff/work
+
+
+on init
+    write /data/.empty 0
+    mount none /data/.empty /proc/vmallocinfo bind # lxcfs?
+
 
 on post-fs-data
     # fix for static IP, must after post-fs-data and before netd
diff --git a/redroid.mk b/redroid.mk
index 99437f8..50f5124 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$(call inherit-product-if-exists, product.mk)
+
 PRODUCT_SOONG_NAMESPACES += external/mesa3d
 
 AUDIOSERVER_MULTILIB := first
@@ -28,7 +30,6 @@ PRODUCT_HOST_PACKAGES += \
     fs_config
 
 PRODUCT_PACKAGES += \
-    vncserver \
     hwcomposer.redroid \
     gralloc.redroid \
     gralloc.gbm \
@@ -94,6 +95,7 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
     frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \
+    vendor/redroid/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
 
 
 # Extend heap size we use for dalvik/art runtime
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index af8c2bf..4dba214 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -7,8 +7,7 @@ MINIMAL_FONT_FOOTPRINT := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-# TODO add panfrost
-BOARD_GPU_DRIVERS := freedreno lima virgl radeonsi
+BOARD_GPU_DRIVERS := virgl radeonsi
 
 DEVICE_MANIFEST_FILE := device/redroid/manifest.xml
 PRODUCT_ENFORCE_VINTF_MANIFEST := true
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index cf86a4c..3d6dba0 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -7,7 +7,7 @@ MINIMAL_FONT_FOOTPRINT := false
 # use seperate vendor partition
 TARGET_COPY_OUT_VENDOR := vendor
 
-BOARD_GPU_DRIVERS := i915 i965 nouveau kmsro r300g r600g virgl vmwgfx iris tegra radeonsi
+BOARD_GPU_DRIVERS := i915 i965 r300g r600g virgl iris radeonsi
 
 DEVICE_MANIFEST_FILE := device/redroid/manifest.xml
 PRODUCT_ENFORCE_VINTF_MANIFEST := true