diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml
index 10c449e2b5..5e60781cba 100644
--- a/.github/workflows/pullRequests.yml
+++ b/.github/workflows/pullRequests.yml
@@ -250,7 +250,26 @@ jobs:
           --storage=ddb","storage":"ddb","id":"d2c31fa2375669d0c176d70c946a6108"},{"cmd":"packages/api-i18n
           --storage=ddb","storage":"ddb","id":"943e15fe21c847b164f9413f8baf97b7"},{"cmd":"packages/api-mailer
           --storage=ddb","storage":"ddb","id":"2cc1dc707a39e72f4e5d9a140677ca39"},{"cmd":"packages/api-page-builder
-          --storage=ddb","storage":"ddb","id":"75450f953b0268335bc5179bd653fd64"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb
+          --shard=1/10","storage":"ddb","id":"1931e579350f473d4926df8837aa5935"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=2/10","storage":"ddb","id":"028af9c7894382f20cba6b7e6aed1fe4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=3/10","storage":"ddb","id":"7f6649b3ba90ab0b4eef9f3d1ce36f6c"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=4/10","storage":"ddb","id":"bff6a32572661dbb18f2021c50851822"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=5/10","storage":"ddb","id":"edc153e67a6bf6c4463c12b6f4cc6bd5"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=6/10","storage":"ddb","id":"d201f415df247b05aeba9b83f5bc52da"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=7/10","storage":"ddb","id":"139ee6b2ff4f4a127a5e271a245e1280"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=8/10","storage":"ddb","id":"74d2e9216b883f7bcc01bba2f3f6e0d4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=9/10","storage":"ddb","id":"483e74e828f22b5c83b2e8cde7c629c4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=10/10","storage":"ddb","id":"67be11dc2c65991cf1694599c32e7b8d"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb","storage":"ddb","id":"48281621c024ae9bbd0f79da5f6f4867"},{"cmd":"packages/api-page-builder-import-export
           --storage=ddb","storage":"ddb","id":"8540085b59af85d1fd82b37b9e890704"},{"cmd":"packages/api-prerendering-service
           --storage=ddb","storage":"ddb","id":"a2831c88465244dc03f188f4a40e4d63"},{"cmd":"packages/api-security
@@ -334,7 +353,26 @@ jobs:
           --storage=ddb-es,ddb","storage":["ddb-es"],"id":"f857b5e4a7381a7f10eadef6ec83d9e0"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"6a7091c172aaf229fbfae3c7d1756e8c"},{"cmd":"packages/api-mailer
           --storage=ddb-es,ddb","storage":"ddb-es","id":"ccc077215f734fbec817d90fdb04d423"},{"cmd":"packages/api-page-builder
-          --storage=ddb-es,ddb","storage":"ddb-es","id":"bde852e6692324ab87f553c8cdda4da4"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-es,ddb
+          --shard=1/10","storage":"ddb-es","id":"b62c2b68fa1d8f46c61da87c0f2a546c"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=2/10","storage":"ddb-es","id":"ee33d43c5e289e2cb067948257937cd3"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=3/10","storage":"ddb-es","id":"f153a1a52ce25cb1fb3b0309db99d343"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=4/10","storage":"ddb-es","id":"d00ff89ac164b2911b594df642ef37a1"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=5/10","storage":"ddb-es","id":"fc645860e5f114fa0474f3ccd1c4f380"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=6/10","storage":"ddb-es","id":"5ae98b4d0f6ebb65d5ec723201009e2a"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=7/10","storage":"ddb-es","id":"de1be6bf9b140165a0060ad38e2131a6"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=8/10","storage":"ddb-es","id":"bbbb68ab6eec4f47494e59ab08b32850"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=9/10","storage":"ddb-es","id":"54a2c4af419affecfc6377ef4e879718"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=10/10","storage":"ddb-es","id":"552ef1386758c600283a711fa5a526f6"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-es,ddb","storage":"ddb-es","id":"d12985ec4dcdb80af419125d236a73d8"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-es,ddb","storage":"ddb-es","id":"911289d4016adf351238298ce5b41ac8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"0c5cd8395d241e54e3488ffcc1c81c26"}]')
@@ -424,7 +462,26 @@ jobs:
           --storage=ddb-os,ddb","storage":["ddb-os"],"id":"ee446fd78ad6294bbfb3c0689ff2602e"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5326eafa76e67756c7f6e4e980cbf1da"},{"cmd":"packages/api-mailer
           --storage=ddb-os,ddb","storage":"ddb-os","id":"0ede859b604febdfa78018cdd1067a77"},{"cmd":"packages/api-page-builder
-          --storage=ddb-os,ddb","storage":"ddb-os","id":"43a3f010297862d078b400953f0f5f9e"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-os,ddb
+          --shard=1/10","storage":"ddb-os","id":"099633a8a255bd0cfeee7fa8a508ec43"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=2/10","storage":"ddb-os","id":"a7a6988e4d90b501fbec6e9ede7f51c8"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=3/10","storage":"ddb-os","id":"20afac1d12b77f074f58345b3c400227"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=4/10","storage":"ddb-os","id":"3fc975a9a676ae1e963c4010e27a422f"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=5/10","storage":"ddb-os","id":"db6a4b85fe56efb3fbb6808327a57459"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=6/10","storage":"ddb-os","id":"65b1f94fb2ebeab472cb03794a805a83"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=7/10","storage":"ddb-os","id":"fd4958778983f961c34be9fabf93faa5"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=8/10","storage":"ddb-os","id":"7b49f49d9ccf4421df6bcf210bfc1f74"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=9/10","storage":"ddb-os","id":"a18a16d02798f5dd27c4e908b60a4be9"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=10/10","storage":"ddb-os","id":"aba1f17f3cc4081b5ba98c5433cc838e"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-os,ddb","storage":"ddb-os","id":"a1a7c90d43da1678f254bd4331cf4d55"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-os,ddb","storage":"ddb-os","id":"e0236755edb31fc1a6005eb161941bf8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5eadfa5cc14ec4e8ba87ac3dfb112580"}]')
diff --git a/.github/workflows/pushDev.yml b/.github/workflows/pushDev.yml
index 07c81e68cd..0bb16cd4a9 100644
--- a/.github/workflows/pushDev.yml
+++ b/.github/workflows/pushDev.yml
@@ -216,7 +216,26 @@ jobs:
           --storage=ddb","storage":"ddb","id":"d2c31fa2375669d0c176d70c946a6108"},{"cmd":"packages/api-i18n
           --storage=ddb","storage":"ddb","id":"943e15fe21c847b164f9413f8baf97b7"},{"cmd":"packages/api-mailer
           --storage=ddb","storage":"ddb","id":"2cc1dc707a39e72f4e5d9a140677ca39"},{"cmd":"packages/api-page-builder
-          --storage=ddb","storage":"ddb","id":"75450f953b0268335bc5179bd653fd64"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb
+          --shard=1/10","storage":"ddb","id":"1931e579350f473d4926df8837aa5935"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=2/10","storage":"ddb","id":"028af9c7894382f20cba6b7e6aed1fe4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=3/10","storage":"ddb","id":"7f6649b3ba90ab0b4eef9f3d1ce36f6c"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=4/10","storage":"ddb","id":"bff6a32572661dbb18f2021c50851822"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=5/10","storage":"ddb","id":"edc153e67a6bf6c4463c12b6f4cc6bd5"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=6/10","storage":"ddb","id":"d201f415df247b05aeba9b83f5bc52da"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=7/10","storage":"ddb","id":"139ee6b2ff4f4a127a5e271a245e1280"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=8/10","storage":"ddb","id":"74d2e9216b883f7bcc01bba2f3f6e0d4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=9/10","storage":"ddb","id":"483e74e828f22b5c83b2e8cde7c629c4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=10/10","storage":"ddb","id":"67be11dc2c65991cf1694599c32e7b8d"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb","storage":"ddb","id":"48281621c024ae9bbd0f79da5f6f4867"},{"cmd":"packages/api-page-builder-import-export
           --storage=ddb","storage":"ddb","id":"8540085b59af85d1fd82b37b9e890704"},{"cmd":"packages/api-prerendering-service
           --storage=ddb","storage":"ddb","id":"a2831c88465244dc03f188f4a40e4d63"},{"cmd":"packages/api-security
@@ -300,7 +319,26 @@ jobs:
           --storage=ddb-es,ddb","storage":["ddb-es"],"id":"f857b5e4a7381a7f10eadef6ec83d9e0"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"6a7091c172aaf229fbfae3c7d1756e8c"},{"cmd":"packages/api-mailer
           --storage=ddb-es,ddb","storage":"ddb-es","id":"ccc077215f734fbec817d90fdb04d423"},{"cmd":"packages/api-page-builder
-          --storage=ddb-es,ddb","storage":"ddb-es","id":"bde852e6692324ab87f553c8cdda4da4"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-es,ddb
+          --shard=1/10","storage":"ddb-es","id":"b62c2b68fa1d8f46c61da87c0f2a546c"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=2/10","storage":"ddb-es","id":"ee33d43c5e289e2cb067948257937cd3"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=3/10","storage":"ddb-es","id":"f153a1a52ce25cb1fb3b0309db99d343"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=4/10","storage":"ddb-es","id":"d00ff89ac164b2911b594df642ef37a1"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=5/10","storage":"ddb-es","id":"fc645860e5f114fa0474f3ccd1c4f380"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=6/10","storage":"ddb-es","id":"5ae98b4d0f6ebb65d5ec723201009e2a"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=7/10","storage":"ddb-es","id":"de1be6bf9b140165a0060ad38e2131a6"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=8/10","storage":"ddb-es","id":"bbbb68ab6eec4f47494e59ab08b32850"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=9/10","storage":"ddb-es","id":"54a2c4af419affecfc6377ef4e879718"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=10/10","storage":"ddb-es","id":"552ef1386758c600283a711fa5a526f6"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-es,ddb","storage":"ddb-es","id":"d12985ec4dcdb80af419125d236a73d8"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-es,ddb","storage":"ddb-es","id":"911289d4016adf351238298ce5b41ac8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"0c5cd8395d241e54e3488ffcc1c81c26"}]')
@@ -389,7 +427,26 @@ jobs:
           --storage=ddb-os,ddb","storage":["ddb-os"],"id":"ee446fd78ad6294bbfb3c0689ff2602e"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5326eafa76e67756c7f6e4e980cbf1da"},{"cmd":"packages/api-mailer
           --storage=ddb-os,ddb","storage":"ddb-os","id":"0ede859b604febdfa78018cdd1067a77"},{"cmd":"packages/api-page-builder
-          --storage=ddb-os,ddb","storage":"ddb-os","id":"43a3f010297862d078b400953f0f5f9e"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-os,ddb
+          --shard=1/10","storage":"ddb-os","id":"099633a8a255bd0cfeee7fa8a508ec43"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=2/10","storage":"ddb-os","id":"a7a6988e4d90b501fbec6e9ede7f51c8"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=3/10","storage":"ddb-os","id":"20afac1d12b77f074f58345b3c400227"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=4/10","storage":"ddb-os","id":"3fc975a9a676ae1e963c4010e27a422f"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=5/10","storage":"ddb-os","id":"db6a4b85fe56efb3fbb6808327a57459"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=6/10","storage":"ddb-os","id":"65b1f94fb2ebeab472cb03794a805a83"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=7/10","storage":"ddb-os","id":"fd4958778983f961c34be9fabf93faa5"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=8/10","storage":"ddb-os","id":"7b49f49d9ccf4421df6bcf210bfc1f74"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=9/10","storage":"ddb-os","id":"a18a16d02798f5dd27c4e908b60a4be9"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=10/10","storage":"ddb-os","id":"aba1f17f3cc4081b5ba98c5433cc838e"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-os,ddb","storage":"ddb-os","id":"a1a7c90d43da1678f254bd4331cf4d55"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-os,ddb","storage":"ddb-os","id":"e0236755edb31fc1a6005eb161941bf8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5eadfa5cc14ec4e8ba87ac3dfb112580"}]')
diff --git a/.github/workflows/pushNext.yml b/.github/workflows/pushNext.yml
index 40fc0a6886..f66abc4e48 100644
--- a/.github/workflows/pushNext.yml
+++ b/.github/workflows/pushNext.yml
@@ -216,7 +216,26 @@ jobs:
           --storage=ddb","storage":"ddb","id":"d2c31fa2375669d0c176d70c946a6108"},{"cmd":"packages/api-i18n
           --storage=ddb","storage":"ddb","id":"943e15fe21c847b164f9413f8baf97b7"},{"cmd":"packages/api-mailer
           --storage=ddb","storage":"ddb","id":"2cc1dc707a39e72f4e5d9a140677ca39"},{"cmd":"packages/api-page-builder
-          --storage=ddb","storage":"ddb","id":"75450f953b0268335bc5179bd653fd64"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb
+          --shard=1/10","storage":"ddb","id":"1931e579350f473d4926df8837aa5935"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=2/10","storage":"ddb","id":"028af9c7894382f20cba6b7e6aed1fe4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=3/10","storage":"ddb","id":"7f6649b3ba90ab0b4eef9f3d1ce36f6c"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=4/10","storage":"ddb","id":"bff6a32572661dbb18f2021c50851822"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=5/10","storage":"ddb","id":"edc153e67a6bf6c4463c12b6f4cc6bd5"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=6/10","storage":"ddb","id":"d201f415df247b05aeba9b83f5bc52da"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=7/10","storage":"ddb","id":"139ee6b2ff4f4a127a5e271a245e1280"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=8/10","storage":"ddb","id":"74d2e9216b883f7bcc01bba2f3f6e0d4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=9/10","storage":"ddb","id":"483e74e828f22b5c83b2e8cde7c629c4"},{"cmd":"packages/api-page-builder
+          --storage=ddb
+          --shard=10/10","storage":"ddb","id":"67be11dc2c65991cf1694599c32e7b8d"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb","storage":"ddb","id":"48281621c024ae9bbd0f79da5f6f4867"},{"cmd":"packages/api-page-builder-import-export
           --storage=ddb","storage":"ddb","id":"8540085b59af85d1fd82b37b9e890704"},{"cmd":"packages/api-prerendering-service
           --storage=ddb","storage":"ddb","id":"a2831c88465244dc03f188f4a40e4d63"},{"cmd":"packages/api-security
@@ -300,7 +319,26 @@ jobs:
           --storage=ddb-es,ddb","storage":["ddb-es"],"id":"f857b5e4a7381a7f10eadef6ec83d9e0"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"6a7091c172aaf229fbfae3c7d1756e8c"},{"cmd":"packages/api-mailer
           --storage=ddb-es,ddb","storage":"ddb-es","id":"ccc077215f734fbec817d90fdb04d423"},{"cmd":"packages/api-page-builder
-          --storage=ddb-es,ddb","storage":"ddb-es","id":"bde852e6692324ab87f553c8cdda4da4"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-es,ddb
+          --shard=1/10","storage":"ddb-es","id":"b62c2b68fa1d8f46c61da87c0f2a546c"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=2/10","storage":"ddb-es","id":"ee33d43c5e289e2cb067948257937cd3"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=3/10","storage":"ddb-es","id":"f153a1a52ce25cb1fb3b0309db99d343"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=4/10","storage":"ddb-es","id":"d00ff89ac164b2911b594df642ef37a1"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=5/10","storage":"ddb-es","id":"fc645860e5f114fa0474f3ccd1c4f380"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=6/10","storage":"ddb-es","id":"5ae98b4d0f6ebb65d5ec723201009e2a"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=7/10","storage":"ddb-es","id":"de1be6bf9b140165a0060ad38e2131a6"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=8/10","storage":"ddb-es","id":"bbbb68ab6eec4f47494e59ab08b32850"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=9/10","storage":"ddb-es","id":"54a2c4af419affecfc6377ef4e879718"},{"cmd":"packages/api-page-builder
+          --storage=ddb-es,ddb
+          --shard=10/10","storage":"ddb-es","id":"552ef1386758c600283a711fa5a526f6"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-es,ddb","storage":"ddb-es","id":"d12985ec4dcdb80af419125d236a73d8"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-es,ddb","storage":"ddb-es","id":"911289d4016adf351238298ce5b41ac8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-es,ddb","storage":"ddb-es","id":"0c5cd8395d241e54e3488ffcc1c81c26"}]')
@@ -389,7 +427,26 @@ jobs:
           --storage=ddb-os,ddb","storage":["ddb-os"],"id":"ee446fd78ad6294bbfb3c0689ff2602e"},{"cmd":"packages/api-headless-cms-tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5326eafa76e67756c7f6e4e980cbf1da"},{"cmd":"packages/api-mailer
           --storage=ddb-os,ddb","storage":"ddb-os","id":"0ede859b604febdfa78018cdd1067a77"},{"cmd":"packages/api-page-builder
-          --storage=ddb-os,ddb","storage":"ddb-os","id":"43a3f010297862d078b400953f0f5f9e"},{"cmd":"packages/api-page-builder-aco
+          --storage=ddb-os,ddb
+          --shard=1/10","storage":"ddb-os","id":"099633a8a255bd0cfeee7fa8a508ec43"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=2/10","storage":"ddb-os","id":"a7a6988e4d90b501fbec6e9ede7f51c8"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=3/10","storage":"ddb-os","id":"20afac1d12b77f074f58345b3c400227"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=4/10","storage":"ddb-os","id":"3fc975a9a676ae1e963c4010e27a422f"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=5/10","storage":"ddb-os","id":"db6a4b85fe56efb3fbb6808327a57459"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=6/10","storage":"ddb-os","id":"65b1f94fb2ebeab472cb03794a805a83"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=7/10","storage":"ddb-os","id":"fd4958778983f961c34be9fabf93faa5"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=8/10","storage":"ddb-os","id":"7b49f49d9ccf4421df6bcf210bfc1f74"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=9/10","storage":"ddb-os","id":"a18a16d02798f5dd27c4e908b60a4be9"},{"cmd":"packages/api-page-builder
+          --storage=ddb-os,ddb
+          --shard=10/10","storage":"ddb-os","id":"aba1f17f3cc4081b5ba98c5433cc838e"},{"cmd":"packages/api-page-builder-aco
           --storage=ddb-os,ddb","storage":"ddb-os","id":"a1a7c90d43da1678f254bd4331cf4d55"},{"cmd":"packages/api-page-builder-so-ddb-es
           --storage=ddb-os,ddb","storage":"ddb-os","id":"e0236755edb31fc1a6005eb161941bf8"},{"cmd":"packages/migrations","storage":["ddb-es","ddb-os"],"id":"bd6345274042973682dcf9af2706627d"},{"cmd":"packages/tasks
           --storage=ddb-os,ddb","storage":"ddb-os","id":"5eadfa5cc14ec4e8ba87ac3dfb112580"}]')
diff --git a/.github/workflows/wac/utils/listPackagesWithJestTests.ts b/.github/workflows/wac/utils/listPackagesWithJestTests.ts
index 62c71ffca6..61a22f5c40 100644
--- a/.github/workflows/wac/utils/listPackagesWithJestTests.ts
+++ b/.github/workflows/wac/utils/listPackagesWithJestTests.ts
@@ -21,6 +21,18 @@ interface PackageWithTestsWithId extends PackageWithTests {
     id: string;
 }
 
+// Takes a PackageWithTests object and returns an array of commands, where each
+// command is just running a subset of tests. This is achieved by using the
+// Jest's `--shard` option.
+const shardPackageTestExecution = (pkg: PackageWithTests, shardsCount: number = 10) => {
+    const commands: PackageWithTests[] = [];
+    for (let currentShard = 1; currentShard <= shardsCount; currentShard++) {
+        commands.push({ ...pkg, cmd: pkg.cmd + ` --shard=${currentShard}/${shardsCount}` });
+    }
+
+    return commands;
+};
+
 const CUSTOM_HANDLERS: Record<string, () => Array<PackageWithTests>> = {
     // Ignore "i18n" package.
     i18n: () => [],
@@ -85,9 +97,18 @@ const CUSTOM_HANDLERS: Record<string, () => Array<PackageWithTests>> = {
 
     "api-page-builder": () => {
         return [
-            { cmd: "packages/api-page-builder --storage=ddb-es,ddb", storage: "ddb-es" },
-            { cmd: "packages/api-page-builder --storage=ddb-os,ddb", storage: "ddb-os" },
-            { cmd: "packages/api-page-builder --storage=ddb", storage: "ddb" }
+            ...shardPackageTestExecution({
+                cmd: "packages/api-page-builder --storage=ddb-es,ddb",
+                storage: "ddb-es"
+            }),
+            ...shardPackageTestExecution({
+                cmd: "packages/api-page-builder --storage=ddb-os,ddb",
+                storage: "ddb-os"
+            }),
+            ...shardPackageTestExecution({
+                cmd: "packages/api-page-builder --storage=ddb",
+                storage: "ddb"
+            })
         ];
     },
     "api-page-builder-so-ddb-es": () => {
@@ -125,26 +146,20 @@ const CUSTOM_HANDLERS: Record<string, () => Array<PackageWithTests>> = {
     },
 
     "api-headless-cms": () => {
-        const shardCount = 10;
-        const commands = [];
-        for (let currentShard = 1; currentShard <= shardCount; currentShard++) {
-            commands.push(
-                {
-                    cmd: `packages/api-headless-cms --storage=ddb-es,ddb --shard=${currentShard}/${shardCount}`,
-                    storage: "ddb-es"
-                },
-                {
-                    cmd: `packages/api-headless-cms --storage=ddb-os,ddb --shard=${currentShard}/${shardCount}`,
-                    storage: "ddb-os"
-                },
-                {
-                    cmd: `packages/api-headless-cms --storage=ddb --shard=${currentShard}/${shardCount}`,
-                    storage: "ddb"
-                }
-            );
-        }
-
-        return commands;
+        return [
+            ...shardPackageTestExecution({
+                cmd: "packages/api-headless-cms --storage=ddb",
+                storage: "ddb"
+            }),
+            ...shardPackageTestExecution({
+                cmd: "packages/api-headless-cms --storage=ddb-es,ddb",
+                storage: "ddb-es"
+            }),
+            ...shardPackageTestExecution({
+                cmd: "packages/api-headless-cms --storage=ddb-os,ddb",
+                storage: "ddb-os"
+            })
+        ];
     },
     "api-headless-cms-ddb-es": () => {
         return [