diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c2c921b3b7..a34d94e642e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,11 +77,11 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.22
+            containerd: v1.6.24
           - ubuntu: 20.04
-            containerd: v1.7.6
+            containerd: v1.7.7
           - ubuntu: 22.04
-            containerd: v1.7.6
+            containerd: v1.7.7
           - ubuntu: 22.04
             containerd: main
     env:
@@ -113,25 +113,25 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.22
+            containerd: v1.6.24
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.6
+            containerd: v1.7.7
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.6
+            containerd: v1.7.7
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.22
+            containerd: v1.6.24
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.6
+            containerd: v1.7.7
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.6
+            containerd: v1.7.7
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
             containerd: main
@@ -221,7 +221,7 @@ jobs:
       - uses: actions/checkout@v4.1.0
         with:
           repository: containerd/containerd
-          ref: v1.7.6
+          ref: v1.7.7
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
@@ -229,7 +229,7 @@ jobs:
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.6
+          ctrdVersion: 1.7.7
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"
diff --git a/Dockerfile b/Dockerfile
index 3c3ef5095b5..6763145415b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.6
+ARG CONTAINERD_VERSION=v1.7.7
 ARG RUNC_VERSION=v1.1.9
 ARG CNI_PLUGINS_VERSION=v1.3.0
 
@@ -30,14 +30,14 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.14.3
 ARG IMGCRYPT_VERSION=v1.1.8
 # Extra deps: Rootless
 ARG ROOTLESSKIT_VERSION=v1.1.1
-ARG SLIRP4NETNS_VERSION=v1.2.1
+ARG SLIRP4NETNS_VERSION=v1.2.2
 # Extra deps: bypass4netns
 ARG BYPASS4NETNS_VERSION=v0.3.0
 # Extra deps: FUSE-OverlayFS
 ARG FUSE_OVERLAYFS_VERSION=v1.13
-ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.6
+ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.7
 # Extra deps: IPFS
-ARG KUBO_VERSION=v0.22.0
+ARG KUBO_VERSION=v0.23.0
 # Extra deps: Init
 ARG TINI_VERSION=v0.19.0
 # Extra deps: Debug
@@ -47,7 +47,7 @@ ARG BUILDG_VERSION=v0.4.1
 ARG GO_VERSION=1.21
 ARG UBUNTU_VERSION=22.04
 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
-ARG GOTESTSUM_VERSION=v1.10.1
+ARG GOTESTSUM_VERSION=v1.11.0
 ARG NYDUS_VERSION=v2.2.3
 ARG SOCI_SNAPSHOTTER_VERSION=0.4.0
 
diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.6 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.6
deleted file mode 100644
index f5731f42f9d..00000000000
--- a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.6
+++ /dev/null
@@ -1,6 +0,0 @@
-2fbf5532021a558a965358e765c21b4dbe891e00ac68d18ab088d3cea4a41613  containerd-fuse-overlayfs-1.0.6-linux-amd64.tar.gz
-9d983f341b7fb980bb7728851aaab41f706cbc55387940800fabcd7f01b33f24  containerd-fuse-overlayfs-1.0.6-linux-arm-v7.tar.gz
-27c40aea2dc37fc59dae790c87193190a8360a310fa8df16fcbec165a46d6163  containerd-fuse-overlayfs-1.0.6-linux-arm64.tar.gz
-ad92ee6c7ecbf7b1f2b78f13eccf5ca82fc5349ef93d9116bef49b6767fbc146  containerd-fuse-overlayfs-1.0.6-linux-ppc64le.tar.gz
-971243ff3da618dbdcc28ef243ed08e834f7acfc164feebd7d25502938d5cae8  containerd-fuse-overlayfs-1.0.6-linux-riscv64.tar.gz
-691c07478f009858cbba66300a0da689fe60daf7fbc13609759ff8ef14ac2a97  containerd-fuse-overlayfs-1.0.6-linux-s390x.tar.gz
diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.7 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.7
new file mode 100644
index 00000000000..82244bc54c7
--- /dev/null
+++ b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.7
@@ -0,0 +1,6 @@
+d9c1a8d511a0697e4262250d54fda79acab86cc7fba20623c5960dbd679c1581  containerd-fuse-overlayfs-1.0.7-linux-amd64.tar.gz
+e365cdff6b81e2e3cd8ec27e074aa416a4379f7601c83f6d647b64cb81d8c56e  containerd-fuse-overlayfs-1.0.7-linux-arm-v7.tar.gz
+013ae62d06a840016437772b6f7206781040528eef04d541a1d3a8b48ec2a70b  containerd-fuse-overlayfs-1.0.7-linux-arm64.tar.gz
+ef4e93f892dd63f5fff8c5602fd188b38717242ae3a0d9944f4facbfb974d65b  containerd-fuse-overlayfs-1.0.7-linux-ppc64le.tar.gz
+cd56a229dda55764c237483198e0373d87d8d4d8381167b57265408057d64269  containerd-fuse-overlayfs-1.0.7-linux-riscv64.tar.gz
+300d16911403a094ccc610730c34eaa313b0f0df1150015c76a4ea0e85fc9ed3  containerd-fuse-overlayfs-1.0.7-linux-s390x.tar.gz
diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.22.0 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.22.0
deleted file mode 100644
index 449d89bb7ff..00000000000
--- a/Dockerfile.d/SHA256SUMS.d/kubo-v0.22.0
+++ /dev/null
@@ -1,3 +0,0 @@
-# From https://github.com/ipfs/kubo/releases
-d708b484d93e95832105968cfe5b2dff592706d18dbfe41d87df8fcb20512baf  kubo_v0.22.0_linux-amd64.tar.gz
-505fd3dff8419b81e9e755297a2c614169d86d25b7bd8e3b0af49d1fd771b0c3  kubo_v0.22.0_linux-arm64.tar.gz
diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.23.0 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.23.0
new file mode 100644
index 00000000000..f43a829064d
--- /dev/null
+++ b/Dockerfile.d/SHA256SUMS.d/kubo-v0.23.0
@@ -0,0 +1,3 @@
+# From https://github.com/ipfs/kubo/releases
+b78d209ce9b5797534348c6939d305b8758b0e4bc3abae532b63d15d9cddb9c6  kubo_v0.23.0_linux-amd64.tar.gz
+0de1bf8564f563b77e7bef620f357c0787b2fad37378c8cdb789a55959e5b543  kubo_v0.23.0_linux-arm64.tar.gz
diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.1 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.1
deleted file mode 100644
index 2d6ef565aa6..00000000000
--- a/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-da4d301ffe36a0edf1cc769059c1f89eadd1afeba285636bcb2f250a6cffffed  slirp4netns-aarch64
-0a540774fd15bdb39cb07d0b9f1e1968640c822cacf879abf0d1a3966f98d30d  slirp4netns-armv7l
-b8c8a1747524ae79c9df9fa21c5d436dca7e5a777de552f8b5dabb1c9a60b941  slirp4netns-ppc64le
-de4c50f9ee29bef7c756d8487ed1ae5694825d853ba96908de23eea6f806431a  slirp4netns-riscv64
-55fe4b10e7279ba4d780091d3a259ff080dc974811e060753599e0d2ba8520a5  slirp4netns-s390x
-cb1d7b7f9bc946c6179efdb8e069d5ee673c3f135668da6bf54f2ed689981833  slirp4netns-x86_64
diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.2 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.2
new file mode 100644
index 00000000000..651745bffc8
--- /dev/null
+++ b/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.2
@@ -0,0 +1,7 @@
+d269b4788a54e6bcc0669a80704ec75e4f6be7c827846b57163b9da3d4efdefe  SOURCE_DATE_EPOCH
+f7d4913ff27f017e22a5aa66a233f0d403549539a6fab594cbbad258f965af1a  slirp4netns-aarch64
+091cb02fae4af0c43596fecdde2eac0cb76c7c5c30963c4b87fc282cb9489571  slirp4netns-armv7l
+228144e9ba9f19905ffbe95767fed10361e620f01f0867c8d1162cf60807b37e  slirp4netns-ppc64le
+5898887f3ababd4e4886932535d5167a87d7497cd2851e259cae566b1b6d636a  slirp4netns-riscv64
+9cf1d1880b8016bd47023a32582655e2f5f96a0ff266faeb932fbf4ef6159dee  slirp4netns-s390x
+2b59dd438ec1814dcd00c3106c0288ca174c3fe9a178f3400baa06818edaae8d  slirp4netns-x86_64
diff --git a/cmd/nerdctl/container_update.go b/cmd/nerdctl/container_update.go
index 50f530e8ed4..5708aa0e310 100644
--- a/cmd/nerdctl/container_update.go
+++ b/cmd/nerdctl/container_update.go
@@ -25,8 +25,8 @@ import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/cri/util"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/api/types"
 	"github.com/containerd/nerdctl/pkg/clientutil"
 	nerdctlContainer "github.com/containerd/nerdctl/pkg/cmd/container"
diff --git a/go.mod b/go.mod
index dc77c5518f6..560727d96d4 100644
--- a/go.mod
+++ b/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/containerd/continuity v0.4.2
 	github.com/containerd/go-cni v1.1.9
 	github.com/containerd/imgcrypt v1.1.8
+	github.com/containerd/log v0.1.0
 	github.com/containerd/nydus-snapshotter v0.13.1
 	github.com/containerd/stargz-snapshotter v0.14.3
 	github.com/containerd/stargz-snapshotter/estargz v0.14.3
diff --git a/go.sum b/go.sum
index 5adf4f701d1..cf10a6249b9 100644
--- a/go.sum
+++ b/go.sum
@@ -46,6 +46,8 @@ github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9
 github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM=
 github.com/containerd/imgcrypt v1.1.8 h1:ZS7TuywcRNLoHpU0g+v4/PsKynl6TYlw5xDVWWoIyFA=
 github.com/containerd/imgcrypt v1.1.8/go.mod h1:x6QvFIkMyO2qGIY2zXc88ivEzcbgvLdWjoZyGqDap5U=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/nydus-snapshotter v0.13.1 h1:5XNkCZ9ivLXCcyx3Jbbfh/fntkcls69uBg0x9VE8zlk=
 github.com/containerd/nydus-snapshotter v0.13.1/go.mod h1:XWAz9ytsjBuKPVXDKP3xoMlcSKNsGnjXlEup6DuzUIo=
 github.com/containerd/stargz-snapshotter v0.14.3 h1:OTUVZoPSPs8mGgmQUE1dqw3WX/3nrsmsurW7UPLWl1U=
diff --git a/pkg/cmd/namespace/remove.go b/pkg/cmd/namespace/remove.go
index 4c1ca7ae29e..25a8720cf84 100644
--- a/pkg/cmd/namespace/remove.go
+++ b/pkg/cmd/namespace/remove.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/api/types"
 )
 
diff --git a/pkg/cmd/system/events.go b/pkg/cmd/system/events.go
index 22083bfe2a6..b18955611e1 100644
--- a/pkg/cmd/system/events.go
+++ b/pkg/cmd/system/events.go
@@ -28,7 +28,7 @@ import (
 	"github.com/containerd/containerd"
 	_ "github.com/containerd/containerd/api/events" // Register grpc event types
 	"github.com/containerd/containerd/events"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/api/types"
 	"github.com/containerd/nerdctl/pkg/formatter"
 	"github.com/containerd/typeurl/v2"
diff --git a/pkg/consoleutil/consoleutil_unix.go b/pkg/consoleutil/consoleutil_unix.go
index 17421a6fed4..49cea373bbf 100644
--- a/pkg/consoleutil/consoleutil_unix.go
+++ b/pkg/consoleutil/consoleutil_unix.go
@@ -24,7 +24,7 @@ import (
 	"os/signal"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/pkg/consoleutil/consoleutil_windows.go b/pkg/consoleutil/consoleutil_windows.go
index ee823786f2a..c8ebf8ee726 100644
--- a/pkg/consoleutil/consoleutil_windows.go
+++ b/pkg/consoleutil/consoleutil_windows.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 )
 
 // HandleConsoleResize resizes the console.
diff --git a/pkg/imgutil/jobs/jobs.go b/pkg/imgutil/jobs/jobs.go
index 47def937a19..d03143d956e 100644
--- a/pkg/imgutil/jobs/jobs.go
+++ b/pkg/imgutil/jobs/jobs.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/remotes"
+	"github.com/containerd/log"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
diff --git a/pkg/imgutil/pull/pull.go b/pkg/imgutil/pull/pull.go
index 11a257684c8..bbe18bf792a 100644
--- a/pkg/imgutil/pull/pull.go
+++ b/pkg/imgutil/pull/pull.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/images"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/remotes"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/imgutil/jobs"
 	"github.com/containerd/nerdctl/pkg/platformutil"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/pkg/imgutil/push/push.go b/pkg/imgutil/push/push.go
index 2829fbdd244..09930a3fa86 100644
--- a/pkg/imgutil/push/push.go
+++ b/pkg/imgutil/push/push.go
@@ -27,11 +27,11 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/images"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/imgutil/jobs"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
diff --git a/pkg/logging/cri_logger.go b/pkg/logging/cri_logger.go
index c47606b2aa0..a6381d33976 100644
--- a/pkg/logging/cri_logger.go
+++ b/pkg/logging/cri_logger.go
@@ -33,7 +33,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/pkg/logging/tail"
 	"github.com/sirupsen/logrus"
 )