diff --git a/waydroid-choose-gpu.sh b/waydroid-choose-gpu.sh
index 47a5b93..3562896 100755
--- a/waydroid-choose-gpu.sh
+++ b/waydroid-choose-gpu.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 lspci="$(lspci -nn | grep '\[03')" # https://pci-ids.ucw.cz/read/PD/03
 
@@ -31,8 +32,9 @@ rendernode=$(ls -l /dev/dri/by-path/ | grep -i $gpuchoice | grep -o "renderD[1-9
 echo /dev/dri/$card
 echo /dev/dri/$rendernode
 
-cp /var/lib/waydroid/lxc/waydroid/config_nodes /var/lib/waydroid/lxc/waydroid/config_nodes.bak
+cp /var/lib/waydroid/lxc/waydroid/config_nodes /var/lib/waydroid/lxc/waydroid/config_nodes_$(date +%Y-%m-%d-%H:%M).bak
+cp /var/lib/waydroid/waydroid.cfg /var/lib/waydroid/waydroid.cfg_$(date +%Y-%m-%d-%H:%M).bak
 #lxc.mount.entry = /dev/dri dev/dri none bind,create=dir,optional 0 0
-sed -i '/dri/d' /var/lib/waydroid/lxc/waydroid/config_nodes
-echo "lxc.mount.entry = /dev/dri/$card dev/dri/card0 none bind,create=file,optional 0 0" >> /var/lib/waydroid/lxc/waydroid/config_nodes
-echo "lxc.mount.entry = /dev/dri/$rendernode dev/dri/renderD128 none bind,create=file,optional 0 0" >> /var/lib/waydroid/lxc/waydroid/config_nodes
+sed -i '/drm_device/d' /var/lib/waydroid/waydroid.cfg
+sed -i "/^\[waydroid\]/a drm_device = /dev/dri/$rendernode" /var/lib/waydroid/waydroid.cfg
+waydroid upgrade --offline