diff --git a/apps/v4/public/r/registries.json b/apps/v4/public/r/registries.json
index a9502c3063..d736fcb01e 100644
--- a/apps/v4/public/r/registries.json
+++ b/apps/v4/public/r/registries.json
@@ -269,6 +269,12 @@
     "url": "https://kanpeki.vercel.app/r/{name}.json",
     "description": "A set of perfect-designed components built on top of React Aria and Motion."
   },
+  {
+    "name": "@kapwa",
+    "homepage": "https://kapwa-two.vercel.app",
+    "url": "https://kapwa-two.vercel.app/r/{name}.json",
+    "description": "Cleanly designed components purposely built for open-source government portals."
+  },
   {
     "name": "@kokonutui",
     "homepage": "https://kokonutui.com",
diff --git a/apps/v4/registry/directory.json b/apps/v4/registry/directory.json
index 6e0301329d..ad04cce734 100644
--- a/apps/v4/registry/directory.json
+++ b/apps/v4/registry/directory.json
@@ -314,6 +314,13 @@
     "description": "A set of perfect-designed components built on top of React Aria and Motion.",
     "logo": "<svg fill='currentColor' role='img' viewBox='5 5 90 90' xmlns='http://www.w3.org/2000/svg'><path d='M60.033 21.233C29.688 21.233 5 45.921 5 76.267a2.5 2.5 0 105 0c0-27.588 22.445-50.033 50.033-50.033C76.557 26.233 90 39.677 90 56.201c0 9.686-7.88 17.566-17.566 17.566-5.459 0-9.901-4.442-9.901-9.901a5.17 5.17 0 015.165-5.165 2.24 2.24 0 012.237 2.237 2.5 2.5 0 105 0c0-3.99-3.247-7.237-7.237-7.237-5.605 0-10.165 4.56-10.165 10.165 0 8.217 6.685 14.901 14.901 14.901C84.877 78.767 95 68.644 95 56.201c0-19.282-15.686-34.968-34.967-34.968z'/></svg>"
   },
+  {
+    "name": "@kapwa",
+    "homepage": "https://kapwa-two.vercel.app",
+    "url": "https://kapwa-two.vercel.app/r/{name}.json",
+    "description": "Cleanly designed components purposely built for open-source government portals.",
+    "logo": "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1080 1080'><defs><style>.cls-1{fill:#fff;}</style></defs><path class='cls-1' d='M156,730.46a14.41,14.41,0,0,0,6.12-4.75,13.65,13.65,0,0,0,2.56-6.55,14.35,14.35,0,0,0-.92-6.94l.53-.24a14.68,14.68,0,0,0,7.34,5.61,12.19,12.19,0,0,0,9.09-.58,13.46,13.46,0,0,0,8-9.16q1.76-6.42-2.32-15.67l-10.09-22.91-54.93,24.18,10.85,24.65a26.54,26.54,0,0,0,6.56,9.48,16.62,16.62,0,0,0,8.34,4.1A15.43,15.43,0,0,0,156,730.46Zm15.6-43.27,3.32,7.56a8.92,8.92,0,0,1,.74,6,6.38,6.38,0,0,1-8.9,3.75,9.3,9.3,0,0,1-4-4.65l-3.24-7.35Zm-30.08,23-3.61-8.2L151,696.25l3.72,8.45a9.83,9.83,0,0,1,.77,6.82,6.87,6.87,0,0,1-4.06,4.4,6,6,0,0,1-5.47,0Q143.46,714.55,141.55,710.22Z'/><polygon class='cls-1' points='174.59 747.42 187.76 768.91 197.83 762.73 184.65 741.25 195.14 734.81 209.44 758.12 219.49 751.96 197.6 716.29 146.44 747.67 168.32 783.34 178.37 777.18 164.07 753.88 174.59 747.42'/><polygon class='cls-1' points='244.62 802.01 253.72 794.53 221.51 755.34 212.41 762.82 223.98 776.9 186.72 807.53 195.8 818.58 233.06 787.95 244.62 802.01'/><polygon class='cls-1' points='284.54 838.67 292.47 829.95 254.94 795.82 247.01 804.53 260.5 816.8 228.04 852.49 238.62 862.11 271.08 826.42 284.54 838.67'/><polygon class='cls-1' points='308.28 884.17 314.94 874.42 294.13 860.21 301.07 850.05 323.65 865.47 330.3 855.74 295.73 832.14 261.89 881.7 296.45 905.3 303.09 895.57 280.51 880.15 287.47 869.96 308.28 884.17'/><path class='cls-1' d='M366.82,877.27a26.06,26.06,0,0,0-9.33-7.38L335.3,858.81l-26.81,53.7,13,6.48,9.17-18.38,6.67,3.33.62,23.27,14.16,7.07-.93-26A17,17,0,0,0,361,905.8a19.54,19.54,0,0,0,7.17-8.25,20.41,20.41,0,0,0,2.37-10.72A17.81,17.81,0,0,0,366.82,877.27Zm-12.13,13.56q-1.86,3.74-5,4.33t-7.53-1.58l-6.4-3.19,7.31-14.64,6.4,3.2Q358.4,883.42,354.69,890.83Z'/><path class='cls-1' d='M419,895.76a31.1,31.1,0,0,0-26.07-7.39,26.45,26.45,0,0,0-13.1,6.84q-5.79,5.38-8.82,14.73a34.66,34.66,0,0,0-1.6,16.7,26,26,0,0,0,6.36,13.24,29.9,29.9,0,0,0,13.2,8.21,29.6,29.6,0,0,0,14,1.33,22.64,22.64,0,0,0,11.65-5.5,26.71,26.71,0,0,0,7.5-12.09l2.45-7.55-24.61-8-3.27,10.06L408,930a9.88,9.88,0,0,1-5.48,6.16c-2.6,1.11-5.77,1.07-9.51-.15-4.27-1.38-7.1-4-8.47-7.77s-1.18-8.44.6-13.92,4.36-9.27,7.75-11.47a12.66,12.66,0,0,1,11.31-1.29,12.25,12.25,0,0,1,6.25,4.16,9.78,9.78,0,0,1,1.88,6.59l14,4.53a21.37,21.37,0,0,0-.79-11.4A24.21,24.21,0,0,0,419,895.76Z'/><path class='cls-1' d='M479.26,908.55a31.51,31.51,0,0,0-28.82-4.3,25.84,25.84,0,0,0-11.7,8.82q-4.74,6.24-6.22,16.06t1.27,17.14a25.87,25.87,0,0,0,8.61,11.88,31.4,31.4,0,0,0,28.81,4.31,26,26,0,0,0,11.73-8.82q4.79-6.25,6.25-16t-1.29-17.18A26,26,0,0,0,479.26,908.55Zm-4.74,26.85q-1.31,8.73-5.61,12.78a13.44,13.44,0,0,1-20.1-3q-3-5.14-1.65-13.86t5.63-12.78a13.45,13.45,0,0,1,20.1,3Q475.83,926.67,474.52,935.4Z'/><polygon class='cls-1' points='524.26 951.55 523.77 951.56 509.75 907.78 493.52 908 514.58 967.74 533.89 967.48 553.33 907.2 537.09 907.42 524.26 951.55'/><path class='cls-1' d='M568,952.59a7.61,7.61,0,0,0-10.65,1.15,7.07,7.07,0,0,0-1.62,5.54,7.23,7.23,0,0,0,2.77,5.13,7.55,7.55,0,0,0,10.65-1.16,7.32,7.32,0,0,0,1.72-5.61A7.21,7.21,0,0,0,568,952.59Z'/><path class='cls-1' d='M617.43,904.85a18.72,18.72,0,0,0-8.93-5.56,24.44,24.44,0,0,0-11.94-.14l-24.25,5.16L584.81,963,599,960l-3.88-18.23,9.64-2a25.88,25.88,0,0,0,11.09-5,18.48,18.48,0,0,0,6-8.65,21.08,21.08,0,0,0,.41-11.18A21.52,21.52,0,0,0,617.43,904.85ZM606.49,925.1q-2,3-6.76,4l-7,1.49-3.8-17.86,7-1.49c3.2-.68,5.79-.4,7.8.85a8.76,8.76,0,0,1,3.87,6A8.93,8.93,0,0,1,606.49,925.1Z'/><polygon class='cls-1' points='657.28 880.34 665.72 902.9 643.56 911.19 635.13 888.62 621.54 893.7 642.56 949.92 656.15 944.84 647.7 922.25 669.85 913.96 678.3 936.55 691.86 931.48 670.84 875.27 657.28 880.34'/><path class='cls-1' d='M207.86,432.72c6.24-.63,12.83-1.42,19.93-2.41,3.23-.45,6.63-.95,10.22-1.5L135.5,340.06l.86,38.09Z'/><path class='cls-1' d='M276.65,422.47c5.49-.92,11-1.86,16.47-2.72,5.11-.82,10-1.54,14.59-2.2L172.61,261.49l-38.87-.86.87,38.87Z'/><path class='cls-1' d='M736.62,669.29c1.46,2.5,2.84,5.05,4.22,7.59l172.67,23.19,27.54-26.33-211.11-15.2C732.21,662.07,734.47,665.61,736.62,669.29Z'/><path class='cls-1' d='M345.66,413.56c6.66-.42,13.23-.64,19.47-.64h.39L251.26,263.25l-38.09-.84,131,151.27Z'/><path class='cls-1' d='M970.36,591.93,727.05,609.44a232.32,232.32,0,0,0-3-29.93l217-15.63-27.54-26.34-192.8,25.9a233.39,233.39,0,0,0-27.87-67.25l154.64-118,.85-38.09L683.84,482.45a238.53,238.53,0,0,0-19-23.31L849.24,299.5l.86-38.87-38.87.86L651.59,445.89a238.32,238.32,0,0,0-23.33-19L770.67,262.41l-38.09.84-118,154.64A234.17,234.17,0,0,0,547.29,390l25.9-192.78-26.34-27.53-15.65,217a235.24,235.24,0,0,0-29.91-3.07L518.8,140.37l-26.89-28.11L465,140.37l17.51,243.29a236.12,236.12,0,0,0-29.93,3.07L437,169.69l-26.33,27.53L436.55,390a233.75,233.75,0,0,0-59.31,23.25c.6,0,1.25,0,1.86,0,64.7,3.91,137.9,43.5,146,121.24l.18,1.75-.13,1.75c-.42,5.8-.52,9.69-.49,12.31l2.34,0c2.36,0,5-.05,7.79-.1,2.3,0,4.75-.09,7.37-.12,73.29.67,138.72,37.23,182.79,101,1-7.55,1.82-15.17,2.11-22.93l243.31,17.51,28.09-26.89Z'/><path class='cls-1' d='M525.86,602.05c-25.65,3.34-49.76,6-73.52-6.63-9.51-5-16.59-14.59-25.06-21.51a189.14,189.14,0,0,0-30.83-20.38c-19.43-10.21-40.55-14.19-61.52-19.92,40.5-1.25,78.21,5.08,112.38,28.34,3.34,2.29,7.42,4.78,11.11,3.14a8.27,8.27,0,0,0,3.18-2.69c10.37-13.6-.59-40.85-7.32-54-8.12-15.69-22.46-33.77-39.45-40.45-30.24-11.9-63-11.7-96.34-7.62-12.25,1.5-24.61,3.54-37,5.73-38.71,6.87-78.33,15.93-117.84,10.73-16.27-2.14-32.93-5.55-47.53-13.29a99,99,0,0,1-19.94-13.94c-3.91-3.52-13.7-11.29-14.67-16.68a176.1,176.1,0,0,0,20.68,57.5c18.14,32,60.52,86.62,103.83,74.59,13.44-3.73,23.28-13.95,34.48-21.59,14-9.5,26.35-10.91,43-9.27,67.1,4.93,195.22,45.08,172.75,132.8C450.7,688,393.16,772,438.54,777.54c20.77.45,49.27-12.55,55.74-33.37,1.05,50.86-59.38,85.08-102.41,58-3.29,13.4,6.87,24.11,17.68,30.49,50.46,29.78,110.63,11.9,164.53,5,28.5-3.64,57.29-6.83,86-5.28a209,209,0,0,1,42.64,6.42c5.08,1.35,36.86,9.67,37.41,15.4C728,728.38,679.79,586.06,525.86,602.05Z'/><path class='cls-1' d='M354.68,581.93c-16.94-6.44-89.92-15-51.33,23.56,8.52,8.52,15.84,22.06,26.3,27.79,18.33,6.93,53.7,13.85,66.8-4.18-1.58,2.18.17,13.38-1,17.08a35.31,35.31,0,0,1-10.06,15.16c-10.88,10-26.7,14.18-40.88,16.65q-6,1-11.95,1.79c-27.82,3.51-57.87,4.42-85.2-1.59-15.45-3.41-29.46-5.67-65.55-25.53,21,29.6,52.43,42.4,59.22,44.29a232,232,0,0,0,46.66,8.12q8,.54,16,.7c15.28.31,31.15-1.88,46.28-4.12,14.94-2.22,30.28-5.88,42.58-15.1C455.83,646.51,399,598.78,354.68,581.93Z'/></svg>"
+  },
   {
     "name": "@kokonutui",
     "homepage": "https://kokonutui.com",