diff --git a/scripts/install-os-packages.sh b/scripts/install-os-packages.sh
index 2c9b918..e026a9f 100755
--- a/scripts/install-os-packages.sh
+++ b/scripts/install-os-packages.sh
@@ -102,7 +102,18 @@ apt_setup() {
     sudo apt-get update && sudo apt-get upgrade -y
 
     sudo apt-get install -y wget gpg extrepo
-    sudo extrepo enable dotnet docker-ce github-cli mattermost nvidia-cuda postgresql syncthing vscode winehq deb-multimedia-backports deb-multimedia-non-free
+    sudo extrepo update
+    sudo extrepo enable dotnet
+    sudo extrepo enable docker-ce
+    sudo extrepo enable github-cli
+    sudo extrepo enable mattermost
+    sudo extrepo enable nvidia-cuda
+    sudo extrepo enable postgresql
+    sudo extrepo enable vscode
+    sudo extrepo enable winehq
+    sudo extrepo enable deb-multimedia-backports
+    sudo extrepo enable deb-multimedia-non-free
+    sudo extrepo enable trivy
 
     if [ "$ID" = "debian" ]; then
         debian_setup
diff --git a/scripts/install.sh b/scripts/install.sh
index c04e7b7..0646fc9 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -23,6 +23,7 @@ manual_installs() {
 }
 
 post_install() {
+    sudo -u "${SUDO_USER:-$(logname)}" systemctl --user enable --now podman.socket
     command -v docker >/dev/null 2>&1 && systemctl enable --now docker >/dev/null 2>&1 && echo "Docker enabled"
     command -v docker >/dev/null 2>&1 && usermod -aG docker "$USER" && newgrp docker && echo "Added $USER to docker group"
 
diff --git a/scripts/package-list-brew b/scripts/package-list-brew
index cc33d04..f87b49b 100644
--- a/scripts/package-list-brew
+++ b/scripts/package-list-brew
@@ -1,18 +1,14 @@
 # Lines that start with # are ignored
 # TIP: Only add commandline apps that aren't available/updated on OS repos
-bat
 bats-core
 dnscrypt-proxy
 dockerfile-language-server
 fd
-fzf
 gitleaks
 go
 htop
-jq
 kondo
 lazydocker
-lazygit
 lua
 lua-language-server
 luajit
@@ -27,7 +23,6 @@ python-lsp-server
 python@3.12
 rclone
 sccache
-shellcheck
 shellharden
 shodan
 speedtest-cli
diff --git a/scripts/package-list-os b/scripts/package-list-os
index acdc281..386de92 100644
--- a/scripts/package-list-os
+++ b/scripts/package-list-os
@@ -1,6 +1,6 @@
 # Lines that start with # are ignored
 
-# Coding: Some are common, some not found in some OSes; all are required
+# Coding
 aspnetcore-runtime-8.0
 build-essential
 clang
@@ -44,14 +44,26 @@ zoxide
 apt-transport-https
 libreadline-dev
 libavcodec-extra
+fonts-dejavu
+fonts-liberation
+fonts-liberation2
+fonts-noto-core
 
 # Below few are dnf-specific packages
 akmod-nvidia
 dnf-plugins-core
 libva-nvidia-driver
 xorg-x11-drv-nvidia-cuda
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+dejavu-serif-fonts
+liberation-fonts-all
+google-noto-sans-fonts
+google-noto-serif-fonts
+google-noto-mono-fonts
 
 # Common
+ImageMagick
 bash
 bat
 bleachbit
@@ -76,7 +88,6 @@ gparted
 grub-customizer
 gzip
 htop
-ImageMagick
 imagemagick
 inxi
 kde-spectacle
@@ -89,18 +100,22 @@ net-tools
 nvidia-driver
 nvidia-settings
 openssh-client
+pavucontrol
+pipewire-audio
 qbittorrent
+qpwgraph
 rclone
 ripgrep
 simplescreenrecorder
 solaar
 syncthing
+ttf-mscorefonts-installer
 ufw
-ulauncher
 vim
 vlc
 vulkan-tools
 wget
+wl-clipboard
 xclip
 xsel
 yt-dlp
@@ -109,6 +124,9 @@ zsh
 # FreeBSD packages
 fusefs-lkl
 firefox-esr
+py311-fastest_pkg
+noto-2.0
+v4l-utils
 
 # Conflicts on FreeBSD
 ca-certificates
diff --git a/scripts/test/Dockerfile b/scripts/test/Dockerfile
index c6c7d3d..d3ad40c 100644
--- a/scripts/test/Dockerfile
+++ b/scripts/test/Dockerfile
@@ -4,7 +4,7 @@
 FROM ubuntu:24.04
 #FROM fedora:42
 WORKDIR /dotfiles
-RUN apt-get update && apt-get install sudo -y     # for debian distros
+RUN apt-get update && apt-get --no-install-recommends install sudo -y
 #RUN dnf install sudo -y                           # for fedora and its derivatives
 COPY . .
 CMD [ "sh", "setup.sh", "-i" ]