diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index 631a784710..51137d0f33 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -10,16 +10,16 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 shelltools.export("DISABLE_WARN_OUTSIDE_CONTAINER", "1")
-shelltools.export("AUTO_GOPATH", "1")
-shelltools.export("DOCKER_GITCOMMIT","89c5e8f")
+# shelltools.export("AUTO_GOPATH", "1")
+shelltools.export("DOCKER_GITCOMMIT","f78c987")
 shelltools.export("IAMSTATIC", "false")
-shelltools.export("VERSION", "28.5.2")
+shelltools.export("VERSION", "29.3.1")
 shelltools.export("GOROOT","/usr/lib/go")
 shelltools.export("GO111MODULE","off")
 
 # shelltools.export("GOPATH", "%s/cli-%s" % (get.workDIR(), get.srcVERSION()))
 
-shelltools.export("GOPATH", "%s" % get.workDIR())
+# shelltools.export("GOPATH", "%s" % get.workDIR())
 shelltools.export("CGO_CFLAGS", "-I/usr/include")
 shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
 shelltools.export("DOCKER_BUILDTAGS","seccomp")
@@ -30,7 +30,7 @@ def setup():
     shelltools.cd("%s" % get.workDIR())
     shelltools.move("cli-*", "cli")
     shelltools.cd("%s" % get.workDIR())
-    shelltools.move("moby-*", "engine")
+    shelltools.move("moby-docker-*", "moby-docker")
     shelltools.cd("%s" % get.workDIR())
     shelltools.move("docker-ce-packaging-19.03.13", "packaging")
 
@@ -39,10 +39,36 @@ def setup():
     shelltools.cd("cli/src/github.com/docker")
     shelltools.system("ln -s ../../../../cli . ")
 
+    # shelltools.cd("%s" % get.workDIR())
+    # shelltools.makedirs("moby/github.com/moby/moby")
+    # shelltools.cd("moby/src/github.com/moby")
+    # shelltools.system("ln -s ../../../../../moby . ")
+
 def build():
+    # build
+    # shelltools.cd("%s" % get.workDIR())
+    # shelltools.cd("cli")
+    # shelltools.system("LDFLAGS='' GOPATH=%s/cli ./scripts/build/binary" % get.workDIR())
+    # gopath = "%s/go" % get.workDIR()
+    # shelltools.cd("%s/go" % get.workDIR())
+
+    # shelltools.cd("%s" % get.workDIR())
+    # shelltools.makedirs("%s/src/github.com/docker" % gopath)
+    # shelltools.makedirs("moby/src/github.com/moby")
+    # shelltools.cd("%s/src/github.com/docker" % gopath)
+    # shelltools.system("ln -sf %s/moby docker" % get.workDIR())
+    # shelltools.cd("moby/src/github.com/moby")
+    # shelltools.system("ln -s ../../../../moby . ")
+    # shelltools.cd("moby")
+
     shelltools.cd("%s" % get.workDIR())
-    shelltools.cd("engine")
-    # shelltools.makedirs("github.com/docker/docker")
+
+    shelltools.cd("moby-docker")
+    shelltools.system("mkdir -p .gopath/src/github.com/moby/moby")
+    shelltools.system("ln -sf $(pwd) .gopath/src/github.com/moby/moby/v2")
+
+    shelltools.export("GOPATH", "%s/moby-docker/.gopath" % get.workDIR())
+    # shelltools.makedirs("bundles/github.com/moby/moby/v2/cmd/dockerd")
     # shelltools.system("make VERSION=%s dynbinary-daemon" % get.srcVERSION())
     shelltools.system("hack/make.sh dynbinary")
     # shelltools.system("make.sh dynbinary-daemon")
@@ -58,15 +84,15 @@ def install():
     pisitools.dobin("build/docker*")
 
     shelltools.cd("%s" % get.workDIR())
-    pisitools.dobin("engine/bundles/dynbinary-daemon/*")
+    pisitools.dobin("moby-docker/bundles/dynbinary-daemon/*")
        
     # insert udev rules
-    pisitools.insinto("/lib/udev/rules.d", "engine/contrib/udev/*.rules")
+    # pisitools.insinto("/lib/udev/rules.d", "moby-docker/contrib/udev/*.rules")
 
     #insert contrib in docs
     pisitools.insinto("/usr/share/doc/docker", "cli/contrib")
     
-    pisitools.dobin("engine/contrib/check-config.sh")
+    pisitools.dobin("moby-docker/contrib/check-config.sh")
 
     shelltools.cd("%s/cli" % get.workDIR())
     pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md")
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index a632c1c89d..f5ed53b16a 100644
--- a/hardware/virtualization/docker/pspec.xml
+++ b/hardware/virtualization/docker/pspec.xml
@@ -13,8 +13,8 @@
         <Summary>Pack, ship and run any application as a lightweight container</Summary>
         <Description>An open platform for distributed applications for developers and sysadmins</Description>
         <!--fix sha1sum-->
-        <Archive sha1sum="5711e769051fba537823680e6cf6732111684c8b" type="targz" name="moby-28.5.2.tar.gz">https://github.com/moby/moby/archive/refs/tags/v28.5.2.tar.gz</Archive>
-        <Archive sha1sum="d5edb2a8242657feafbe6b8ec68474c40781bdce" type="targz" name="cli-28.5.2.tar.gz">https://github.com/docker/cli/archive/refs/tags/v28.5.2.tar.gz</Archive>
+        <Archive sha1sum="41a1451ccca80853ffa3eecd7c5b3955ad294ab6" type="targz">https://github.com/moby/moby/archive/refs/tags/docker-v29.3.1.tar.gz</Archive>
+        <Archive sha1sum="07371ee997aeaa36344479d7cb22b4c4a7ce8ba0" type="targz" name="cli-29.3.1.tar.gz">https://github.com/docker/cli/archive/refs/tags/v29.3.1.tar.gz</Archive>
         <Archive sha1sum="b83a1df61c591912a890f60571ddfb57c0bccd07" type="targz" name="docker-ce-19.03.13.tar.gz">https://github.com/docker/docker-ce-packaging/archive/refs/tags/v19.03.13.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
@@ -66,6 +66,13 @@
     </Package>
 
     <History>
+        <Update release="25">
+            <Date>2026-03-27</Date>
+            <Version>29.3.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="24">
             <Date>2025-12-30</Date>
             <Version>28.5.2</Version>