diff --git a/builder/data/64bit/raspberrypi64.yml b/builder/data/64bit/raspberrypi64.yml
index 5ca0bc96..dd634711 100644
--- a/builder/data/64bit/raspberrypi64.yml
+++ b/builder/data/64bit/raspberrypi64.yml
@@ -14,11 +14,18 @@
     system:
       boot_options:
         - "dtoverlay=dwc2"
-        - "dtoverlay=spi0-0cs"
         - "dtparam=i2c1=on"
         - "dtparam=i2c_arm=on"
         - "dtparam=spi=on"
         - "gpu_mem=16"
+        - "[pi0]"
+        - "dtoverlay=spi0-0cs"
+        - "[pi3]"
+        - "dtoverlay=spi0-0cs"
+        - "[pi4]"
+        - "dtoverlay=spi0-0cs"
+        - "[pi5]"
+        - "dtoverlay=spi6-2cs"
       modules:
         - "i2c-dev"
     services:
@@ -204,6 +211,13 @@
         path: /etc/rc.local
         state: absent
 
+    - name: adjust /boot/config.txt
+      lineinfile:
+        dest: /boot/config.txt
+        insertafter: EOF
+        line: '{{ item }}'
+      with_items: "{{system.boot_options}}"
+
     - name: change root partition
       replace:
         dest: /boot/firmware/cmdline.txt
diff --git a/pwnagotchi/ui/hw/libs/waveshare/epdconfig.py b/pwnagotchi/ui/hw/libs/waveshare/epdconfig.py
index 84ce7126..99e5b270 100644
--- a/pwnagotchi/ui/hw/libs/waveshare/epdconfig.py
+++ b/pwnagotchi/ui/hw/libs/waveshare/epdconfig.py
@@ -51,7 +51,7 @@ class RaspberryPi:
         self.SPI = spidev.SpiDev()
         self.GPIO_RST_PIN = gpiozero.LED(self.RST_PIN)
         self.GPIO_DC_PIN = gpiozero.LED(self.DC_PIN)
-        # self.GPIO_CS_PIN     = gpiozero.LED(self.CS_PIN)
+        self.GPIO_CS_PIN     = gpiozero.LED(self.CS_PIN)
         self.GPIO_PWR_PIN = gpiozero.LED(self.PWR_PIN)
         self.GPIO_BUSY_PIN = gpiozero.Button(self.BUSY_PIN, pull_up=False)
 
@@ -66,11 +66,11 @@ class RaspberryPi:
                 self.GPIO_DC_PIN.on()
             else:
                 self.GPIO_DC_PIN.off()
-        # elif pin == self.CS_PIN:
-        #     if value:
-        #         self.GPIO_CS_PIN.on()
-        #     else:
-        #         self.GPIO_CS_PIN.off()
+        elif pin == self.CS_PIN:
+            if value:
+                self.GPIO_CS_PIN.on()
+            else:
+                self.GPIO_CS_PIN.off()
         elif pin == self.PWR_PIN:
             if value:
                 self.GPIO_PWR_PIN.on()
@@ -84,8 +84,8 @@ class RaspberryPi:
             return self.RST_PIN.value
         elif pin == self.DC_PIN:
             return self.DC_PIN.value
-        # elif pin == self.CS_PIN:
-        #     return self.CS_PIN.value
+        elif pin == self.CS_PIN:
+            return self.CS_PIN.value
         elif pin == self.PWR_PIN:
             return self.PWR_PIN.value
 
@@ -119,7 +119,7 @@ class RaspberryPi:
         if cleanup:
             self.GPIO_RST_PIN.close()
             self.GPIO_DC_PIN.close()
-            # self.GPIO_CS_PIN.close()
+            self.GPIO_CS_PIN.close()
             self.GPIO_PWR_PIN.close()
             self.GPIO_BUSY_PIN.close()