diff --git a/hardware/virtualization/containerd/pspec.xml b/hardware/virtualization/containerd/pspec.xml
index f4e77ffce0..414a500db1 100644
--- a/hardware/virtualization/containerd/pspec.xml
+++ b/hardware/virtualization/containerd/pspec.xml
@@ -11,9 +11,9 @@
         <License>Apache-2.0</License>
         <Summary>A daemon to control runC, built for performance and density.</Summary>
         <Description>is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI specification.</Description>
-        <Archive sha1sum="1263657a8c6926a16e390de92c5eea2079f27173" type="targz">https://github.com/containerd/containerd/archive/v2.1.3.tar.gz</Archive>
+        <Archive sha1sum="ea4e8f1186b2bfd1643450c0677445b0cfd837ec" type="targz">https://github.com/containerd/containerd/archive/v2.2.0.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency versionFrom="1.22.2">golang</Dependency>
+            <Dependency versionFrom="1.25.4">golang</Dependency>
             <Dependency>git</Dependency>
             <Dependency>libseccomp-devel</Dependency>
             <Dependency>btrfs-progs-devel</Dependency>
@@ -33,6 +33,13 @@
     </Package>
 
     <History>
+        <Update release="18">
+            <Date>2025-11-10</Date>
+            <Version>2.2.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="17">
             <Date>2025-07-17</Date>
             <Version>2.1.3</Version>
diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index 66e7cbec50..c36896bf08 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -11,9 +11,9 @@ from pisi.actionsapi import get
 
 shelltools.export("DISABLE_WARN_OUTSIDE_CONTAINER", "1")
 shelltools.export("AUTO_GOPATH", "1")
-shelltools.export("DOCKER_GITCOMMIT","e77ff99")
+shelltools.export("DOCKER_GITCOMMIT","f8215cc")
 shelltools.export("IAMSTATIC", "false")
-shelltools.export("VERSION", "28.3.2")
+shelltools.export("VERSION", "28.5.1")
 shelltools.export("GOROOT","/usr/lib/go")
 shelltools.export("GO111MODULE","off")
 
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index 3d1d66626b..8cf2f78474 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="75af4b6f5272ea5e91683bc52cca78a075fbdebd" type="targz" name="moby-28.3.2.tar.gz">https://github.com/moby/moby/archive/refs/tags/v28.3.2.tar.gz</Archive>
-        <Archive sha1sum="e7c3044232579210851d2a1e6c3aa2b9fc728300" type="targz" name="cli-28.3.2.tar.gz">https://github.com/docker/cli/archive/refs/tags/v28.3.2.tar.gz</Archive>
+        <Archive sha1sum="f251fc1949559001b0a2880c4bdfeceaf1d0058a" type="targz" name="moby-28.5.1.tar.gz">https://github.com/moby/moby/archive/refs/tags/v28.5.1.tar.gz</Archive>
+        <Archive sha1sum="55c1f79a7344546a12aba2f64d4032267ee9f96e" type="targz" name="cli-28.5.1.tar.gz">https://github.com/docker/cli/archive/refs/tags/v28.5.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="23">
+            <Date>2025-11-10</Date>
+            <Version>28.5.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="22">
             <Date>2025-07-17</Date>
             <Version>28.3.2</Version>