diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD
index 1c668ee7f..11b0eab30 100644
--- a/main/postmarketos-ui-i3wm/APKBUILD
+++ b/main/postmarketos-ui-i3wm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=postmarketos-ui-i3wm
 pkgver=0.3
-pkgrel=9
+pkgrel=10
 pkgdesc="(X11) Tiling WM (keyboard required)"
 url="https://i3wm.org"
 arch="noarch"
@@ -25,7 +25,7 @@ depends="
 	xorg-server
 	xset
 	"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="lock.sh 65-lightdm-autologin.conf"
 options="!check"
 
diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-deinstall b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-deinstall
deleted file mode 100644
index 808661530..000000000
--- a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rm /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
deleted file mode 100644
index 95f5b7614..000000000
--- a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
-rc-update add lightdm default
diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
new file mode 120000
index 000000000..61e5e6797
--- /dev/null
+++ b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-i3wm.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.pre-deinstall b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.pre-deinstall
deleted file mode 100644
index c815bf5fd..000000000
--- a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.pre-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del lightdm
diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD
index e22ccf216..f99dd0f72 100644
--- a/main/postmarketos-ui-mate/APKBUILD
+++ b/main/postmarketos-ui-mate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-mate
 pkgver=5
-pkgrel=1
+pkgrel=2
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
@@ -31,7 +31,7 @@ _pmb_recommends="
 	pulseaudio-utils
 	unclutter-xfixes
 	"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	000-system-background.gschema.override
 	001-screensaver.gschema.override
diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-deinstall b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-deinstall
deleted file mode 100644
index e572aa338..000000000
--- a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rm /usr/share/lightdm/lightdm.conf.d/61-autologin.conf
diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.pre-deinstall b/main/postmarketos-ui-mate/postmarketos-ui-mate.pre-deinstall
deleted file mode 100644
index c815bf5fd..000000000
--- a/main/postmarketos-ui-mate/postmarketos-ui-mate.pre-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del lightdm
diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD
index 99a2c1bbf..832e58717 100644
--- a/main/postmarketos-ui-xfce4/APKBUILD
+++ b/main/postmarketos-ui-xfce4/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-xfce4
 pkgver=0.5.1
-pkgrel=3
+pkgrel=4
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
 url="https://gitlab.com/postmarketOS/xfce4-phone"
 arch="noarch"
@@ -39,7 +39,7 @@ _pmb_recommends="
 	xfce4-terminal
 	xfce4-whiskermenu-plugin
 	"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
 	10_onboard.gschema.override
diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.pre-deinstall b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.pre-deinstall
deleted file mode 100644
index c815bf5fd..000000000
--- a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.pre-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del lightdm