diff --git a/testing/zot/APKBUILD b/testing/zot/APKBUILD
index 6e3565d7b15..f50544b8242 100644
--- a/testing/zot/APKBUILD
+++ b/testing/zot/APKBUILD
@@ -1,14 +1,16 @@
-# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
+maintainer="Hoang Nguyen <folliekazetani@protonmail.com>"
 pkgname=zot
-pkgver=2.1.0
-_zui_commit=c78b303ee88555b39b9f21f136e702724b1725b0
+pkgver=2.1.1
+_zui_commit=5a9533d95e1b74c4f6a6893e0111659308052edf
 pkgrel=0
 pkgdesc="Vendor-neutral OCI-native container image registry"
 url="https://zotregistry.dev/"
-# 32-bit, s390x, riscv64, loongarch64: tests fail to build
-arch="all !armv7 !armhf !x86 !s390x !riscv64 !loongarch64"
+# 32-bit: tests fail to build
+# riscv64: npm run build fails
+arch="all !x86 !armhf !armv7 !riscv64"
 license="Apache-2.0"
 makedepends="go linux-headers npm nodejs"
+checkdepends="openssl"
 subpackages="
 	$pkgname-doc
 	$pkgname-openrc
@@ -25,6 +27,7 @@ source="
 	zot.confd
 
 	basename_patch
+	fix-test-typo.patch
 	"
 options="net" # download Go modules
 
@@ -49,10 +52,10 @@ build() {
 	cd "$builddir"
 	local _extensions="sync,search,scrub,metrics,lint,ui,mgmt,profile,userprefs,imagetrust"
 	local _goldflags="
-	-X zotregistry.io/zot/pkg/api/config.ReleaseTag=v$pkgver
-	-X zotregistry.io/zot/pkg/api/config.Commit=AlpineLinux
-	-X zotregistry.io/zot/pkg/api/config.BinaryType=${_extensions//,/-}
-	-X zotregistry.io/zot/pkg/api/config.GoVersion=$(go env GOVERSION)
+	-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=v$pkgver
+	-X zotregistry.dev/zot/pkg/api/config.Commit=AlpineLinux
+	-X zotregistry.dev/zot/pkg/api/config.BinaryType=${_extensions//,/-}
+	-X zotregistry.dev/zot/pkg/api/config.GoVersion=$(go env GOVERSION)
 	"
 
 	for binary in zot zb zli; do
@@ -70,15 +73,18 @@ build() {
 }
 
 check() {
-	# Skip tests requiring static container image tarballs (pulled via skopeo) in ./test/data/
-	# and oras binary in ./hack/tools/
-	# shellcheck disable=2046
+	# A small part of 'make test/data'
+	mkdir -p test/data/noidentity
+	cd test/data
+	sh ../scripts/gen_certs.sh
+	cd noidentity
+	sh ../../scripts/gen_nameless_certs.sh
+
+	# Skip tests requiring static container image tarballs (pulled via skopeo) in $builddir/test/data/
+	cd "$builddir"
 	go test -tags containers_image_openpgp \
-		-skip TestHTTPClient \
-		$(go list ./... | grep -v \
-		-e 'pkg/test/image-utils$' \
-		-e 'pkg/test/common$' \
-		-e 'pkg/storage/local$')
+		-skip 'TestGarbageCollectForImageStore|TestImageBuilder|TestPredefinedImages' \
+		./...
 }
 
 package() {
@@ -122,9 +128,10 @@ _zshcomp() {
 }
 
 sha512sums="
-f54484dac486273255308f2a20a70af38f920931361c267d7995474d0edb21fa91a2710b7b23d90f5e47bbbf161abf3737994f9da2e145195afcf1a3fb4a9932  zot-2.1.0.tar.gz
-5f71e5162e52ce0b2bb524d74b577fee56e026c880b353b0bd5f0ba82e9eb74ed56dfffd0f8e38a318dcd3740aab8b3485534b2d2d3e77277a4666f6c70d355d  zui-c78b303ee88555b39b9f21f136e702724b1725b0.tar.gz
+ee7ca29f01e55e64a28b6dcdef6ca394227691c541b8aeb3c2ca59bbc0390742032c920d17a0f5c65dc8811b82d9afab0132178cd859304839a4c0f66e2cc861  zot-2.1.1.tar.gz
+f89665d970899fa9618a7c6aedaf269968cebf399a13d1534e2e2bfcf021edccba1dc819365ae43d7f2f2a42a3d6e6447577d217ee42707fb06990a722d2cc64  zui-5a9533d95e1b74c4f6a6893e0111659308052edf.tar.gz
 86dfa273e97110b703fbc368757520ef6169dead185ff54b5b8ba45e764949bc3a21a51d53a1605d7163faef8c83c066e688577f5315b8c0afb09f69a2bbe3bb  zot.initd
 b128ecaf3e35cfdab8069da9a8267a9faed50b892ae07b6a4a22a4108236d6cdbc10cc4cf0105c728e9e6da6ac773f56d1dd84de1ba4463110058b6c2f190b30  zot.confd
 640526de31a5eb21112c3d3fd30ce78331e5f5998166c9af9405ebad919a9a895ee82e3eed7067c2ce7e3e558e31907398fec1ad895be708e9f8ada696076216  basename_patch
+3014867cab31146315ef42a7bc0300cdfc2c2e9b293a87399dc264445e069c392d9452f106c99077e4c1498605cf7b97cc88136afb66686d02891575933db685  fix-test-typo.patch
 "
diff --git a/testing/zot/fix-test-typo.patch b/testing/zot/fix-test-typo.patch
new file mode 100644
index 00000000000..e6c9475c49a
--- /dev/null
+++ b/testing/zot/fix-test-typo.patch
@@ -0,0 +1,13 @@
+diff --git a/pkg/common/common_test.go b/pkg/common/common_test.go
+index a6c0f7c..e3a00fd 100644
+--- a/pkg/common/common_test.go
++++ b/pkg/common/common_test.go
+@@ -118,7 +118,7 @@ func TestCommon(t *testing.T) {
+ 	})
+
+ 	Convey("Test AreSocketsEqual with equal IPv6 sockets", t, func() {
+-		result, err := common.AreSocketsEqual("[::1]:9000", "[0000:0000:0000:0000:0000:0000:0000:00001]:9000")
++		result, err := common.AreSocketsEqual("[::1]:9000", "[0000:0000:0000:0000:0000:0000:0000:0001]:9000")
+ 		So(err, ShouldBeNil)
+ 		So(result, ShouldBeTrue)
+ 	})