diff --git a/debian/control b/debian/control
index 2526f697be23158a8dcc1f60970870c2bb8fd14c..93b8999ed1d68326feb800bf82d6423ad12a9f6d 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Depends:
  python3-evdev,
  rfkill,
  u-boot-tools,
-Breaks: wys (<< 0.1.1)
+Breaks: wys (<< 0.1.1),
+ phoc (<< 0.1.6),
 Description: Basic configuration for the librem5-devkit
  This package contains initial configuration for the
  librem5 devkits.
diff --git a/debian/librem5-devkit-base.install b/debian/librem5-devkit-base.install
index 4914bbc1b2525ec0598ff86e9eb358024e5ac8c2..7c0337f1f48400a64b8599938484117614e72ff6 100644
--- a/debian/librem5-devkit-base.install
+++ b/debian/librem5-devkit-base.install
@@ -1,3 +1,2 @@
 etc/
-lib/
 usr/
diff --git a/etc/profile.d/etnaviv.sh b/etc/profile.d/etnaviv.sh
deleted file mode 100644
index d333de12d48920cdba1a7685d30b0ed274a42317..0000000000000000000000000000000000000000
--- a/etc/profile.d/etnaviv.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# ETNA_MESA_DEBUG=no_supertile is required by phoc, but breaks other GL apps
-unset ETNA_MESA_DEBUG
diff --git a/lib/systemd/system/phosh.service.d/no_supertile.conf b/lib/systemd/system/phosh.service.d/no_supertile.conf
deleted file mode 100644
index 67afdde2a5bdd68e23e561524320f4abf4049231..0000000000000000000000000000000000000000
--- a/lib/systemd/system/phosh.service.d/no_supertile.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment=ETNA_MESA_DEBUG=no_supertile