diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec
index 04b5f101cbb..a90f6f75fb8 100644
--- a/SPECS/ca-certificates/ca-certificates.spec
+++ b/SPECS/ca-certificates/ca-certificates.spec
@@ -45,7 +45,7 @@ Name:           ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
 Epoch:          1
 Version:        2.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -180,7 +180,7 @@ install -p -m 644 %{SOURCE16} %{buildroot}%{catrustdir}/extracted/pem/README
 install -p -m 644 %{SOURCE17} %{buildroot}%{catrustdir}/extracted/edk2/README
 install -p -m 644 %{SOURCE18} %{buildroot}%{catrustdir}/source/README
 
-# base certs
+# Base certs
 %install_bundles %{SOURCE21} %{p11_format_base_bundle}
 
 # Microsoft certs
@@ -224,6 +224,10 @@ ln -s %{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle} \
 ln -s %{catrustdir}/extracted/%{java_bundle} \
     %{buildroot}%{pkidir}/%{java_bundle}
 
+# Supporting p11-kit's directory re-name in version 0.24.0.
+ln -s blacklist %{buildroot}%{_datadir}/pki/ca-trust-source/blocklist
+ln -s blacklist %{buildroot}%{catrustdir}/source/blocklist
+
 %post
 %{refresh_bundles}
 
@@ -270,8 +274,10 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{pkidir}/%{java_bundle}
 
 # symlink directory
+%{_datadir}/pki/ca-trust-source/blocklist
 %{_sysconfdir}/ssl/certs
 %{_libdir}/ssl/certs
+%{catrustdir}/source/blocklist
 
 # README files
 %{_datadir}/pki/ca-trust-source/README
@@ -318,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{_bindir}/bundle2pem.sh
 
 %changelog
+* Fri Mar 17 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-11
+- Adding support for p11-kit's 0.24.0+ source certificates paths.
+
 * Thu Feb 23 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-10
 - Adding Microsoft-owned root CAs to the base bundle.
 
diff --git a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
index 04540c2fb25..60a132da8f5 100644
--- a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
+++ b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates-base
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Fri Mar 17 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-11
+- Making 'Release' match with 'ca-certificates'.
+
 * Thu Feb 23 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-10
 - Making 'Release' match with 'ca-certificates'.
 
diff --git a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
index e942f88c01d..932791ac8ea 100644
--- a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
+++ b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Fri Mar 17 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-11
+- Making 'Release' match with 'ca-certificates'.
+
 * Thu Feb 23 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-10
 - Making 'Release' match with 'ca-certificates'.
 
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
index 9b0a1518ac4..582a1eb368c 100644
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -228,10 +228,10 @@ libffi-devel-3.4.2-2.cm2.aarch64.rpm
 libtasn1-4.19.0-1.cm2.aarch64.rpm
 p11-kit-0.24.1-1.cm2.aarch64.rpm
 p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
-ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
-ca-certificates-base-2.0.0-10.cm2.noarch.rpm
-ca-certificates-2.0.0-10.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
+ca-certificates-base-2.0.0-11.cm2.noarch.rpm
+ca-certificates-2.0.0-11.cm2.noarch.rpm
 dwz-0.14-1.cm2.aarch64.rpm
 unzip-6.0-20.cm2.aarch64.rpm
 python3-3.9.14-6.cm2.aarch64.rpm
diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
index 7a22afda1c7..5e54c58007e 100644
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -228,10 +228,10 @@ libffi-devel-3.4.2-2.cm2.x86_64.rpm
 libtasn1-4.19.0-1.cm2.x86_64.rpm
 p11-kit-0.24.1-1.cm2.x86_64.rpm
 p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
-ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
-ca-certificates-base-2.0.0-10.cm2.noarch.rpm
-ca-certificates-2.0.0-10.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
+ca-certificates-base-2.0.0-11.cm2.noarch.rpm
+ca-certificates-2.0.0-11.cm2.noarch.rpm
 dwz-0.14-1.cm2.x86_64.rpm
 unzip-6.0-20.cm2.x86_64.rpm
 python3-3.9.14-6.cm2.x86_64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
index 57340173336..8304ce6e43e 100644
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.aarch64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.aarch64.rpm
 bzip2-devel-1.0.8-1.cm2.aarch64.rpm
 bzip2-libs-1.0.8-1.cm2.aarch64.rpm
-ca-certificates-2.0.0-10.cm2.noarch.rpm
-ca-certificates-base-2.0.0-10.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-10.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
+ca-certificates-2.0.0-11.cm2.noarch.rpm
+ca-certificates-base-2.0.0-11.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-11.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
 ccache-4.6-2.cm2.aarch64.rpm
 ccache-debuginfo-4.6-2.cm2.aarch64.rpm
 check-0.15.2-1.cm2.aarch64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
index fcc6396cee2..6bd9e742dc9 100644
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.x86_64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.x86_64.rpm
 bzip2-devel-1.0.8-1.cm2.x86_64.rpm
 bzip2-libs-1.0.8-1.cm2.x86_64.rpm
-ca-certificates-2.0.0-10.cm2.noarch.rpm
-ca-certificates-base-2.0.0-10.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-10.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
+ca-certificates-2.0.0-11.cm2.noarch.rpm
+ca-certificates-base-2.0.0-11.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-11.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
 ccache-4.6-2.cm2.x86_64.rpm
 ccache-debuginfo-4.6-2.cm2.x86_64.rpm
 check-0.15.2-1.cm2.x86_64.rpm