diff --git a/website/src/app/page.tsx b/website/src/app/page.tsx
index 6530463a6..61d456ee7 100644
--- a/website/src/app/page.tsx
+++ b/website/src/app/page.tsx
@@ -35,7 +35,7 @@ export default function Page() {
             <Link href="/docs/deploy">
               <button
                 type="button"
-                className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded-md bg-gradient-to-br from-accent-700 to-accent-600 hover:scale-105 duration-0 transform transition"
+                className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded bg-gradient-to-br from-accent-700 to-accent-600 hover:scale-105 duration-0 transform transition"
               >
                 Deploy now
                 <HiArrowLongRight className="ml-2 -mr-1 w-6 h-6" />
@@ -44,7 +44,7 @@ export default function Page() {
           </div>
           <div className="flex items-center justify-center">
             <video
-              className="shadow-lg rounded-md"
+              className="shadow-lg rounded"
               width="960"
               height="540"
               loop
@@ -160,7 +160,7 @@ export default function Page() {
         <div className="gap-8 py-8 px-4 mx-auto max-w-screen-xl flex flex-col-reverse lg:grid lg:grid-cols-2 xl:gap-16 sm:py-16 lg:px-6 ">
           <div className="flex flex-col">
             <Image
-              className="rounded-md shadow-md"
+              className="rounded shadow-md"
               width={600}
               height={500}
               alt="Feature 2"
@@ -268,7 +268,7 @@ export default function Page() {
             </ActionLink>
           </div>
           <Image
-            className="rounded-md shadow-md"
+            className="rounded shadow-md"
             width={600}
             height={500}
             alt="Feature 3"
@@ -355,7 +355,7 @@ export default function Page() {
           </h3>
         </div>
         <div className="gap-4 items-center pt-8 px-4 mx-auto max-w-screen-xl lg:grid lg:grid-cols-2 xl:gap-8 sm:pt-16 lg:px-6 ">
-          <div className="bg-neutral-100 p-8 rounded-md shadow-md">
+          <div className="bg-neutral-100 p-8 rounded shadow-md">
             <div className="flex items-center space-x-2.5">
               <HiHome className="flex-shrink-0 w-5 h-5 text-primary-450" />
               <h3 className="text-xl tracking-tight font-bold text-neutral-900 ">
@@ -399,7 +399,7 @@ export default function Page() {
               Access your personal project
             </ActionLink>
           </div>
-          <div className="bg-neutral-100 p-8 rounded-md shadow-md">
+          <div className="bg-neutral-100 p-8 rounded shadow-md">
             <div className="flex items-center space-x-2.5">
               <HiRocketLaunch className="flex-shrink-0 w-5 h-5 text-primary-450" />
               <h3 className="text-xl tracking-tight font-bold text-neutral-900 ">
@@ -443,7 +443,7 @@ export default function Page() {
               Scale your secure access
             </ActionLink>
           </div>
-          <div className="bg-neutral-100 p-8 rounded-md shadow-md">
+          <div className="bg-neutral-100 p-8 rounded shadow-md">
             <div className="flex items-center space-x-2.5">
               <HiGlobeAlt className=" lex-shrink-0 w-5 h-5 text-primary-450" />
               <h3 className="text-xl tracking-tight font-bold text-neutral-900 ">
@@ -487,7 +487,7 @@ export default function Page() {
               Secure your remote workforce
             </ActionLink>
           </div>
-          <div className="bg-neutral-100 p-8 rounded-md shadow-md">
+          <div className="bg-neutral-100 p-8 rounded shadow-md">
             <div className="flex items-center space-x-2.5">
               <HiWrenchScrewdriver className=" lex-shrink-0 w-5 h-5 text-primary-450" />
               <h3 className="text-xl tracking-tight font-bold text-neutral-900 ">
@@ -557,7 +557,7 @@ export default function Page() {
           <div className="flex mt-8">
             <button
               type="button"
-              className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded-md bg-gradient-to-br from-primary-500 to-primary-450 hover:scale-105 duration-0 transform transition"
+              className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded bg-gradient-to-br from-primary-500 to-primary-450 hover:scale-105 duration-0 transform transition"
             >
               <Link href="/contact/sales">Contact sales</Link>
               <HiArrowLongRight className="ml-2 -mr-1 w-6 h-6" />
diff --git a/website/src/app/product/early-access/page.tsx b/website/src/app/product/early-access/page.tsx
index b5821ecbf..c95c412ee 100644
--- a/website/src/app/product/early-access/page.tsx
+++ b/website/src/app/product/early-access/page.tsx
@@ -41,7 +41,7 @@ export default function EarlyAccess() {
             <span className="z-0">
               <Image
                 src="/images/portal_mockup.svg"
-                className="shadow-lg rounded-lg"
+                className="shadow-lg rounded"
                 height={500}
                 width={800}
                 alt="firezone portal mockup"
diff --git a/website/src/app/product/roadmap/_page.tsx b/website/src/app/product/roadmap/_page.tsx
index 9ccdf2685..487c4d757 100644
--- a/website/src/app/product/roadmap/_page.tsx
+++ b/website/src/app/product/roadmap/_page.tsx
@@ -63,7 +63,7 @@ function RoadmapItem({
   return (
     <li
       key={entryId}
-      className="shadow-sm bg-white rounded-sm shadow-sm p-4 mb-4 hover:shadow-md"
+      className="shadow-sm bg-white rounded shadow-sm p-4 mb-4 hover:shadow-md"
     >
       <h5 className="text-lg font-semibold">
         <Link
diff --git a/website/src/components/Banner/index.tsx b/website/src/components/Banner/index.tsx
index 3fbd81596..58df7314d 100644
--- a/website/src/components/Banner/index.tsx
+++ b/website/src/components/Banner/index.tsx
@@ -33,7 +33,7 @@ export default function Banner({
       <button
         data-collapse-toggle="banner"
         type="button"
-        className="flex items-center text-neutral-50 hover:bg-neutral-50 hover:text-neutral-900 rounded-lg text-sm p-1.5  "
+        className="flex items-center text-neutral-50 hover:bg-neutral-50 hover:text-neutral-900 rounded text-sm p-1.5  "
       >
         <HiXMark className="w-5 h-5" />
       </button>
diff --git a/website/src/components/DeployButton/index.tsx b/website/src/components/DeployButton/index.tsx
index 6adcf31c1..9e1a19db2 100644
--- a/website/src/components/DeployButton/index.tsx
+++ b/website/src/components/DeployButton/index.tsx
@@ -6,7 +6,7 @@ export default function DeployButton() {
     <Link href="/docs/deploy">
       <button
         type="button"
-        className="text-white font-bold tracking-tight rounded-md duration-0 hover:scale-105 transition transform shadow-lg text-sm px-5 py-2.5 bg-gradient-to-br from-accent-700 to-accent-600"
+        className="text-white font-bold tracking-tight rounded duration-0 hover:scale-105 transition transform shadow-lg text-sm px-5 py-2.5 bg-gradient-to-br from-accent-700 to-accent-600"
       >
         Deploy now
       </button>
diff --git a/website/src/components/DocsSidebar/Collapse.tsx b/website/src/components/DocsSidebar/Collapse.tsx
index eeed96e5a..1e2a4a766 100644
--- a/website/src/components/DocsSidebar/Collapse.tsx
+++ b/website/src/components/DocsSidebar/Collapse.tsx
@@ -22,7 +22,7 @@ export default function Collapse({
         type="button"
         className={
           text +
-          " flex items-center w-full transition duration-75 rounded-lg group hover:bg-neutral-100 "
+          " flex items-center w-full transition duration-75 rounded group hover:bg-neutral-100 "
         }
         aria-controls={ctl}
         data-collapse-toggle={ctl}
diff --git a/website/src/components/DocsSidebar/Item.tsx b/website/src/components/DocsSidebar/Item.tsx
index 9332ba39d..ce7f83c2e 100644
--- a/website/src/components/DocsSidebar/Item.tsx
+++ b/website/src/components/DocsSidebar/Item.tsx
@@ -13,7 +13,7 @@ export default function Item({ href, label }: { href: string; label: string }) {
       href={href}
       className={[
         active(href),
-        "flex items-center text-left rounded-lg text-base font-normal text-neutral-900 hover:bg-neutral-100  ",
+        "flex items-center text-left rounded text-base font-normal text-neutral-900 hover:bg-neutral-100  ",
       ].join(" ")}
     >
       <span className="ml-3">{label}</span>
diff --git a/website/src/components/HubspotForm/index.tsx b/website/src/components/HubspotForm/index.tsx
index 6ef68d25b..f00336810 100644
--- a/website/src/components/HubspotForm/index.tsx
+++ b/website/src/components/HubspotForm/index.tsx
@@ -17,7 +17,7 @@ export default function HubspotForm({
   });
 
   return (
-    <div className="bg-white shadow-md border border-neutral-200  rounded-lg p-4">
+    <div className="bg-white shadow-md border border-neutral-200  rounded p-4">
       <h3 className="mb-4 lg:mb-8 text-xl font-bold tracking-tight text-neutral-900 sm:text-xl border-b ">
         {title}
       </h3>
diff --git a/website/src/components/JoinOurCommunity/index.tsx b/website/src/components/JoinOurCommunity/index.tsx
index d2eecf31f..f441a918b 100644
--- a/website/src/components/JoinOurCommunity/index.tsx
+++ b/website/src/components/JoinOurCommunity/index.tsx
@@ -14,7 +14,7 @@ export default function JoinOurCommunity() {
         </h3>
       </div>
       <div className="gap-4 items-center pt-4 px-4 mx-auto max-w-screen-lg lg:grid lg:grid-cols-3 xl:gap-8 sm:pt-8 lg:px-6 ">
-        <div className="py-8 rounded-md shadow-md text-center bg-white">
+        <div className="py-8 rounded shadow text-center bg-white">
           <HiUserGroup className="flex-shrink-0 w-12 h-12 mx-auto text-primary-450 " />
           <h3 className="text-4xl my-8 font-bold justify-center tracking-tight text-primary-900 ">
             30+
@@ -22,14 +22,14 @@ export default function JoinOurCommunity() {
           <p className="mb-8 text-xl font-semibold">Contributors</p>
           <button
             type="button"
-            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded-md hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
+            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
           >
             <Link href="https://github.com/firezone/firezone/fork">
               Fork us on GitHub
             </Link>
           </button>
         </div>
-        <div className="py-8 rounded-md shadow-md text-center bg-white">
+        <div className="py-8 rounded shadow-md text-center bg-white">
           <HiStar className="flex-shrink-0 w-12 h-12 mx-auto text-primary-450 " />
           <h3 className="text-4xl my-8 font-bold justify-center tracking-tight text-primary-900 ">
             4,300+
@@ -37,14 +37,14 @@ export default function JoinOurCommunity() {
           <p className="mb-8 text-xl font-semibold">GitHub stars</p>
           <button
             type="button"
-            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded-md hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
+            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
           >
             <Link href="https://github.com/firezone/firezone">
               Drop us a star
             </Link>
           </button>
         </div>
-        <div className="py-8 rounded-md shadow-md text-center bg-white">
+        <div className="py-8 rounded shadow-md text-center bg-white">
           <HiChatBubbleLeftRight className="flex-shrink-0 w-12 h-12 mx-auto text-primary-450 " />
           <h3 className="text-4xl my-8 font-bold justify-center tracking-tight text-primary-900 ">
             250+
@@ -52,7 +52,7 @@ export default function JoinOurCommunity() {
           <p className="mb-8 text-xl font-semibold">Members</p>
           <button
             type="button"
-            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded-md hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
+            className="inline-flex shadow-lg justify-center items-center py-3 px-5 text-base font-bold text-center text-white rounded hover:scale-105 duration-0 transform transition bg-gradient-to-br from-accent-700 to-accent-600"
           >
             <Link href="https://firezone-users.slack.com/join/shared_invite/zt-19jd956j4-rWcCqiKMh~ikPGsUFbvZiA#/shared-invite/email">
               Join our Slack
diff --git a/website/src/components/RootNavbar/SidebarToggle.tsx b/website/src/components/RootNavbar/SidebarToggle.tsx
index 68f199780..2d17f80a3 100644
--- a/website/src/components/RootNavbar/SidebarToggle.tsx
+++ b/website/src/components/RootNavbar/SidebarToggle.tsx
@@ -11,7 +11,7 @@ export default function SidebarToggle() {
         data-drawer-target="docs-sidebar"
         data-drawer-toggle="docs-sidebar"
         aria-controls="docs-sidebar"
-        className="py-2 ml-2 text-neutral-800 rounded-lg cursor-pointer md:hidden hover:text-neutral-900 hover:bg-neutral-100 focus:bg-neutral-100  focus:ring-2 focus:ring-neutral-100    "
+        className="py-2 ml-2 text-neutral-800 rounded cursor-pointer md:hidden hover:text-neutral-900 hover:bg-neutral-100 focus:bg-neutral-100  focus:ring-2 focus:ring-neutral-100    "
       >
         <HiBars3 aria-hidden="true" className="w-6 h-6" />
         <span className="sr-only">Toggle sidebar</span>
diff --git a/website/src/components/RootNavbar/index.tsx b/website/src/components/RootNavbar/index.tsx
index e724ca46d..584f05d96 100644
--- a/website/src/components/RootNavbar/index.tsx
+++ b/website/src/components/RootNavbar/index.tsx
@@ -91,7 +91,7 @@ export default function RootNavbar() {
             </button>
             <div
               id="product-dropdown-menu"
-              className="z-10 hidden bg-white divide-y divide-gray-100 rounded-md shadow-lg w-44"
+              className="z-10 hidden bg-white divide-y divide-gray-100 rounded shadow-lg w-44"
             >
               <ul className="py-2" aria-labelledby="product-dropdown-link">
                 <li>