diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish
new file mode 100755
index 00000000000..884b37f53b6
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
new file mode 100755
index 00000000000..3125a4f89ed
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ln -sf /run/podman/podman.sock /run/docker.sock
+exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/podman/files/podman/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
new file mode 100755
index 00000000000..8eb8f41752e
--- /dev/null
+++ b/srcpkgs/podman/files/podman/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index c719e4ca605..95e0531abad 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -34,4 +34,6 @@ post_install() {
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
+	vsv podman
+	vsv podman-docker
 }