diff --git a/env/20_services.zsh b/env/20_services.zsh
index 414be03..640e7a4 100644
--- a/env/20_services.zsh
+++ b/env/20_services.zsh
@@ -1,4 +1,9 @@
 if [[ $DISPLAY && $UID != 0 ]]; then
 	export SVDIR="$HOME/.local/session_service"
 	export SVDIR_TEMPLATES="$HOME/.service-available"
+elif [[ $UID != 0 ]]; then
+	export SVDIR=$HOME/.service
+	export SVDIR_TEMPLATES="$HOME/.service-available"
+else
+	export SVDIR_TEMPLATES="/etc/sv"
 fi
diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh
new file mode 100644
index 0000000..79035dd
--- /dev/null
+++ b/env/90_podman-socket.zsh
@@ -0,0 +1,4 @@
+if command -v podman &>/dev/null; then
+	export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}')
+	export DOCKER_HOST=unix://$DOCKER_SOCKET
+fi