diff --git a/builder/data/usr/bin/hdmioff b/builder/data/usr/bin/hdmioff
index 8f272bf7..5c32d62c 100755
--- a/builder/data/usr/bin/hdmioff
+++ b/builder/data/usr/bin/hdmioff
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo /opt/vc/bin/tvservice -o
\ No newline at end of file
+sudo /usr/bin/tvservice -o
\ No newline at end of file
diff --git a/builder/data/usr/bin/hdmion b/builder/data/usr/bin/hdmion
index 3bd2188b..eec440fc 100755
--- a/builder/data/usr/bin/hdmion
+++ b/builder/data/usr/bin/hdmion
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo /opt/vc/bin/tvservice -p
\ No newline at end of file
+sudo /usr/bin/tvservice -p
\ No newline at end of file
diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index 7200e786..1441acc3 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -261,20 +261,6 @@
         force: true
       ignore_errors: true
 
-    - name: change hdmioff
-      lineinfile:
-        dest: /usr/bin/hdmioff
-        regexp: '^/opt/vc/'
-        line: "/usr/"
-        state: present
-
-    - name: change hdmion
-      lineinfile:
-        dest: /usr/bin/hdmion
-        regexp: '^/opt/vc/'
-        line: "/usr/"
-        state: present
-
     - name: add HDMI powersave to rc.local
       blockinfile:
         path: /etc/rc.local
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index a18912be..bfeb06be 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -230,8 +230,8 @@
     - name: disable sap plugin for bluetooth.service
       lineinfile:
         dest: /lib/systemd/system/bluetooth.service
-        regexp: '^ExecStart=/usr/lib(exec)?/bluetooth/bluetoothd$'
-        line: 'ExecStart=/usr/lib/bluetooth/bluetoothd --noplugin=sap'
+        regexp: '^ExecStart=/usr/libexec/bluetooth/bluetoothd$'
+        line: 'ExecStart=/usr/libexec/bluetooth/bluetoothd --noplugin=sap'
         state: present
 
     - name: configure dphys-swapfile