diff --git a/mkosi.conf.d/99-packages-development.conf b/mkosi.conf.d/99-packages-development.conf
index d3918c4..47d99ab 100644
--- a/mkosi.conf.d/99-packages-development.conf
+++ b/mkosi.conf.d/99-packages-development.conf
@@ -8,6 +8,9 @@ Packages=base-devel
          clazy
          cmake
          distrobox
+         docker
+         docker-buildx
+         docker-compose
          edk2-ovmf
          flatpak-builder
          gammaray
@@ -18,7 +21,6 @@ Packages=base-devel
          perf
          podman
          podman-compose
-         podman-docker
          qemu-desktop
          tree
          vim
diff --git a/mkosi.extra/etc/docker/daemon.json b/mkosi.extra/etc/docker/daemon.json
new file mode 100644
index 0000000..84ba83d
--- /dev/null
+++ b/mkosi.extra/etc/docker/daemon.json
@@ -0,0 +1,3 @@
+{
+    "group": "wheel",
+}
diff --git a/mkosi.extra/etc/docker/daemon.json.license b/mkosi.extra/etc/docker/daemon.json.license
new file mode 100644
index 0000000..6e34bf6
--- /dev/null
+++ b/mkosi.extra/etc/docker/daemon.json.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2024 Lasath Fernando <devel@lasath.org>