diff --git a/next.config.mjs b/next.config.mjs
index e115cc99..cd210e56 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -36,22 +36,17 @@ const nextConfig = {
             },
             {
                 source: '/docs/getting-started/installation',
-                destination: '/how-to/getting-started#installation',
+                destination: '/get-started/install',
                 permanent: true,
             },
             {
                 source: '/docs/overview/personal-access-tokens',
-                destination: '/how-to/access-netbird-public-api',
-                permanent: true,
-            },
-            {
-                source: '/docs/overview/personal-access-tokens',
-                destination: '/how-to/access-netbird-public-api',
+                destination: '/manage/public-api',
                 permanent: true,
             },
             {
                 source: '/docs/overview/acls',
-                destination: '/how-to/manage-network-access',
+                destination: '/manage/access-control/manage-network-access',
                 permanent: true,
             },
             {
@@ -81,12 +76,12 @@ const nextConfig = {
             },
             {
                 source: '/docs/how-to-guides/activity-monitoring',
-                destination: '/how-to/monitor-system-and-network-activity',
+                destination: '/manage/activity/traffic-events-logging',
                 permanent: true,
             },
             {
                 source: '/docs/how-to-guides/periodic-authentication',
-                destination: '/how-to/enforce-periodic-user-authentication',
+                destination: '/manage/settings/enforce-periodic-user-authentication',
                 permanent: true,
             },
             {
@@ -432,6 +427,87 @@ const nextConfig = {
                 destination: '/manage/team/idp-sync/keycloak-sync',
                 permanent: true,
             },
+            // documentation redirects for settings
+            {
+                source: '/how-to/enforce-periodic-user-authentication',
+                destination: '/manage/settings/enforce-periodic-user-authentication',
+                permanent: true,
+            },
+            {
+                source: '/how-to/multi-factor-authentication',
+                destination: '/manage/settings/multi-factor-authentication',
+                permanent: true,
+            },
+            {
+                source: '/how-to/delete-account',
+                destination: '/manage/settings/delete-account',
+                permanent: true,
+            },
+            {
+                source: '/how-to/plans-and-billing',
+                destination: '/manage/settings/plans-and-billing',
+                permanent: true,
+            },
+            // documentation redirects for integrations
+            {
+                source: '/how-to/enable-post-quantum-cryptography',
+                destination: '/manage/integrations/enable-post-quantum-cryptography',
+                permanent: true,
+            },
+            {
+                source: '/how-to/jamf-pro-netbird-integration',
+                destination: '/manage/integrations/mdm-deployment/jamf-pro-netbird-integration',
+                permanent: true,
+            },
+            {
+                source: '/how-to/kandji-netbird-integration',
+                destination: '/manage/integrations/mdm-deployment/kandji-netbird-integration',
+                permanent: true,
+            },
+            {
+                source: '/how-to/intune-netbird-integration',
+                destination: '/manage/integrations/mdm-deployment/intune-netbird-integration',
+                permanent: true,
+            },
+            {
+                source: '/how-to/kubernetes-operator',
+                destination: '/manage/integrations/kubernetes',
+                permanent: true,
+            },
+            // documentation redirects for public-api
+            {
+                source: '/how-to/access-netbird-public-api',
+                destination: '/manage/public-api',
+                permanent: true,
+            },
+            // documentation redirects for for-partners
+            {
+                source: '/how-to/msp-portal',
+                destination: '/manage/for-partners/msp-portal',
+                permanent: true,
+            },
+            {
+                source: '/how-to/acronis-netbird-integration',
+                destination: '/manage/for-partners/acronis-integration',
+                permanent: true,
+            },
+            // documentation redirects for client
+            {
+                source: '/how-to/profiles',
+                destination: '/client/profiles',
+                permanent: true,
+            },
+            // documentation redirects for help
+            {
+                source: '/how-to/troubleshooting-client',
+                destination: '/help/troubleshooting-client',
+                permanent: true,
+            },
+            {
+                source: '/how-to/report-bug-issues',
+                destination: '/help/report-bug-issues',
+                permanent: true,
+            },
         ]
     },
     rewrites: async () => {
diff --git a/public/docs-static/img/architecture/acls.png b/public/docs-static/img/about-netbird/acls.png
similarity index 100%
rename from public/docs-static/img/architecture/acls.png
rename to public/docs-static/img/about-netbird/acls.png
diff --git a/public/docs-static/img/architecture/high-level-dia.png b/public/docs-static/img/about-netbird/high-level-dia.png
similarity index 100%
rename from public/docs-static/img/architecture/high-level-dia.png
rename to public/docs-static/img/about-netbird/high-level-dia.png
diff --git a/public/docs-static/img/architecture/management.png b/public/docs-static/img/about-netbird/management.png
similarity index 100%
rename from public/docs-static/img/architecture/management.png
rename to public/docs-static/img/about-netbird/management.png
diff --git a/public/docs-static/img/architecture/mesh.png b/public/docs-static/img/about-netbird/mesh.png
similarity index 100%
rename from public/docs-static/img/architecture/mesh.png
rename to public/docs-static/img/about-netbird/mesh.png
diff --git a/public/docs-static/img/architecture/peer-auto-tagging-setupkey.gif b/public/docs-static/img/about-netbird/peer-auto-tagging-setupkey.gif
similarity index 100%
rename from public/docs-static/img/architecture/peer-auto-tagging-setupkey.gif
rename to public/docs-static/img/about-netbird/peer-auto-tagging-setupkey.gif
diff --git a/public/docs-static/img/architecture/relay.png b/public/docs-static/img/about-netbird/relay.png
similarity index 100%
rename from public/docs-static/img/architecture/relay.png
rename to public/docs-static/img/about-netbird/relay.png
diff --git a/public/docs-static/img/architecture/setup-keys.png b/public/docs-static/img/about-netbird/setup-keys.png
similarity index 100%
rename from public/docs-static/img/architecture/setup-keys.png
rename to public/docs-static/img/about-netbird/setup-keys.png
diff --git a/public/docs-static/img/architecture/signal.png b/public/docs-static/img/about-netbird/signal.png
similarity index 100%
rename from public/docs-static/img/architecture/signal.png
rename to public/docs-static/img/about-netbird/signal.png
diff --git a/public/docs-static/img/how-to-guides/profiles/manage-profiles.png b/public/docs-static/img/client/profiles/manage-profiles.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/profiles/manage-profiles.png
rename to public/docs-static/img/client/profiles/manage-profiles.png
diff --git a/public/docs-static/img/how-to-guides/profiles/profiles.gif b/public/docs-static/img/client/profiles/profiles.gif
similarity index 100%
rename from public/docs-static/img/how-to-guides/profiles/profiles.gif
rename to public/docs-static/img/client/profiles/profiles.gif
diff --git a/public/docs-static/img/how-to-guides/profiles/profiles.png b/public/docs-static/img/client/profiles/profiles.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/profiles/profiles.png
rename to public/docs-static/img/client/profiles/profiles.png
diff --git a/public/docs-static/img/get-started/mobile/app-store-badge.svg b/public/docs-static/img/get-started/mobile/app-store-badge.svg
old mode 100644
new mode 100755
diff --git a/public/docs-static/img/troubleshooting-client/ui-bundle-success.png b/public/docs-static/img/help/troubleshooting-client/ui-bundle-success.png
similarity index 100%
rename from public/docs-static/img/troubleshooting-client/ui-bundle-success.png
rename to public/docs-static/img/help/troubleshooting-client/ui-bundle-success.png
diff --git a/public/docs-static/img/troubleshooting-client/ui-bundle-wizard.png b/public/docs-static/img/help/troubleshooting-client/ui-bundle-wizard.png
similarity index 100%
rename from public/docs-static/img/troubleshooting-client/ui-bundle-wizard.png
rename to public/docs-static/img/help/troubleshooting-client/ui-bundle-wizard.png
diff --git a/public/docs-static/img/troubleshooting-client/ui-settings.png b/public/docs-static/img/help/troubleshooting-client/ui-settings.png
similarity index 100%
rename from public/docs-static/img/troubleshooting-client/ui-settings.png
rename to public/docs-static/img/help/troubleshooting-client/ui-settings.png
diff --git a/public/docs-static/img/how-to-guides/account-settings.png b/public/docs-static/img/how-to-guides/account-settings.png
deleted file mode 100644
index 976050d9..00000000
Binary files a/public/docs-static/img/how-to-guides/account-settings.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/app-store-badge.svg b/public/docs-static/img/how-to-guides/app-store-badge.svg
deleted file mode 100755
index 072b425a..00000000
--- a/public/docs-static/img/how-to-guides/app-store-badge.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
-  <title>Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917</title>
-  <g>
-    <g>
-      <g>
-        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
-        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
-      </g>
-      <g id="_Group_" data-name="&lt;Group&gt;">
-        <g id="_Group_2" data-name="&lt;Group&gt;">
-          <g id="_Group_3" data-name="&lt;Group&gt;">
-            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
-            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
-          </g>
-        </g>
-        <g>
-          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
-          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
-          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
-          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
-          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
-          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
-          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
-          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
-        </g>
-      </g>
-    </g>
-    <g id="_Group_4" data-name="&lt;Group&gt;">
-      <g>
-        <path d="M37.82619,8.731a2.63964,2.63964,0,0,1,2.80762,2.96484c0,1.90625-1.03027,3.002-2.80762,3.002H35.67092V8.731Zm-1.22852,5.123h1.125a1.87588,1.87588,0,0,0,1.96777-2.146,1.881,1.881,0,0,0-1.96777-2.13379h-1.125Z" style="fill: #fff"/>
-        <path d="M41.68068,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C44.57522,13.99463,45.01369,13.42432,45.01369,12.44434Z" style="fill: #fff"/>
-        <path d="M51.57326,14.69775h-.92187l-.93066-3.31641h-.07031l-.92676,3.31641h-.91309l-1.24121-4.50293h.90137l.80664,3.436h.06641l.92578-3.436h.85254l.92578,3.436h.07031l.80273-3.436h.88867Z" style="fill: #fff"/>
-        <path d="M53.85354,10.19482H54.709v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M59.09377,8.437h.88867v6.26074h-.88867Z" style="fill: #fff"/>
-        <path d="M61.21779,12.44434a2.13346,2.13346,0,1,1,4.24756,0,2.1338,2.1338,0,1,1-4.24756,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C64.11232,13.99463,64.5508,13.42432,64.5508,12.44434Z" style="fill: #fff"/>
-        <path d="M66.4009,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,66.4009,13.42432Zm2.89453-.38477v-.37646l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,69.29543,13.03955Z" style="fill: #fff"/>
-        <path d="M71.34816,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074h-.85156v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C72.0718,14.772,71.34816,13.87061,71.34816,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C72.72121,10.91846,72.26613,11.49707,72.26613,12.44434Z" style="fill: #fff"/>
-        <path d="M79.23,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C82.12453,13.99463,82.563,13.42432,82.563,12.44434Z" style="fill: #fff"/>
-        <path d="M84.66945,10.19482h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915H87.605V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M93.51516,9.07373v1.1416h.97559v.74854h-.97559V13.2793c0,.47168.19434.67822.63672.67822a2.96657,2.96657,0,0,0,.33887-.02051v.74023a2.9155,2.9155,0,0,1-.4834.04541c-.98828,0-1.38184-.34766-1.38184-1.21582v-2.543h-.71484v-.74854h.71484V9.07373Z" style="fill: #fff"/>
-        <path d="M95.70461,8.437h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723H98.69v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/>
-        <path d="M104.76125,13.48193a1.828,1.828,0,0,1-1.95117,1.30273A2.04531,2.04531,0,0,1,100.73,12.46045a2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27V12.688h-3.17969v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,101.63527,12.03076Z" style="fill: #fff"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/public/docs-static/img/how-to-guides/azure-client-secret.png b/public/docs-static/img/how-to-guides/azure-client-secret.png
deleted file mode 100644
index 43f82751..00000000
Binary files a/public/docs-static/img/how-to-guides/azure-client-secret.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/azure-grant-admin-consent.png b/public/docs-static/img/how-to-guides/azure-grant-admin-consent.png
deleted file mode 100644
index 081b2ffa..00000000
Binary files a/public/docs-static/img/how-to-guides/azure-grant-admin-consent.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/azure-new-application.png b/public/docs-static/img/how-to-guides/azure-new-application.png
deleted file mode 100644
index 8fb9f066..00000000
Binary files a/public/docs-static/img/how-to-guides/azure-new-application.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/azure-openid-permissions.png b/public/docs-static/img/how-to-guides/azure-openid-permissions.png
deleted file mode 100644
index e1aeb798..00000000
Binary files a/public/docs-static/img/how-to-guides/azure-openid-permissions.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/create-route-posturecheck-final.png.png b/public/docs-static/img/how-to-guides/create-route-posturecheck-final.png.png
deleted file mode 100644
index 99e4ab82..00000000
Binary files a/public/docs-static/img/how-to-guides/create-route-posturecheck-final.png.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/create-route-with-posturecheck.png b/public/docs-static/img/how-to-guides/create-route-with-posturecheck.png
deleted file mode 100644
index 233e0b1d..00000000
Binary files a/public/docs-static/img/how-to-guides/create-route-with-posturecheck.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/create-rule.png b/public/docs-static/img/how-to-guides/create-rule.png
deleted file mode 100644
index 3fb57c38..00000000
Binary files a/public/docs-static/img/how-to-guides/create-rule.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/crowdstrike-credentials.png b/public/docs-static/img/how-to-guides/crowdstrike-credentials.png
deleted file mode 100644
index e047b843..00000000
Binary files a/public/docs-static/img/how-to-guides/crowdstrike-credentials.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/crowdstrike-groups-zta.png b/public/docs-static/img/how-to-guides/crowdstrike-groups-zta.png
deleted file mode 100644
index 69423997..00000000
Binary files a/public/docs-static/img/how-to-guides/crowdstrike-groups-zta.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/crowdstrike-integration.png b/public/docs-static/img/how-to-guides/crowdstrike-integration.png
deleted file mode 100644
index 65c17cf3..00000000
Binary files a/public/docs-static/img/how-to-guides/crowdstrike-integration.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/crowdstrike-region.png b/public/docs-static/img/how-to-guides/crowdstrike-region.png
deleted file mode 100644
index 6ee7bbe3..00000000
Binary files a/public/docs-static/img/how-to-guides/crowdstrike-region.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/distribute-to-groups-posturechecks.png b/public/docs-static/img/how-to-guides/distribute-to-groups-posturechecks.png
deleted file mode 100644
index 4aecd195..00000000
Binary files a/public/docs-static/img/how-to-guides/distribute-to-groups-posturechecks.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/edr-approval-required.png b/public/docs-static/img/how-to-guides/edr-approval-required.png
deleted file mode 100644
index 9757bfd5..00000000
Binary files a/public/docs-static/img/how-to-guides/edr-approval-required.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/enable-ssh-access.png b/public/docs-static/img/how-to-guides/enable-ssh-access.png
deleted file mode 100644
index b16a6c84..00000000
Binary files a/public/docs-static/img/how-to-guides/enable-ssh-access.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations-back.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations-back.png
deleted file mode 100644
index 8f9785af..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations-back.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations.png
deleted file mode 100644
index e19a4788..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/edr-integrations.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/compliance-config.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/compliance-config.png
deleted file mode 100644
index 74166d28..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/compliance-config.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/console-config.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/console-config.png
deleted file mode 100644
index e45f4449..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/console-config.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/edr-approval-required.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/edr-approval-required.png
deleted file mode 100644
index 37b80a18..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/edr-approval-required.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/getting-started.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/getting-started.png
deleted file mode 100644
index 27f5b016..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/getting-started.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/group-config.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/group-config.png
deleted file mode 100644
index e507e8ab..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/group-config.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/service-user.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/service-user.png
deleted file mode 100644
index 054ab5ac..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/service-user.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/sync-config.png b/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/sync-config.png
deleted file mode 100644
index f7706b9c..00000000
Binary files a/public/docs-static/img/how-to-guides/endpoint-detection-and-response/sentinelone/sync-config.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-assign-service-account.png b/public/docs-static/img/how-to-guides/google-assign-service-account.png
deleted file mode 100644
index 0fc74509..00000000
Binary files a/public/docs-static/img/how-to-guides/google-assign-service-account.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-edit-service-account.png b/public/docs-static/img/how-to-guides/google-edit-service-account.png
deleted file mode 100644
index 50a6bdc1..00000000
Binary files a/public/docs-static/img/how-to-guides/google-edit-service-account.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-new-admin-role.png b/public/docs-static/img/how-to-guides/google-new-admin-role.png
deleted file mode 100644
index b87dfd1b..00000000
Binary files a/public/docs-static/img/how-to-guides/google-new-admin-role.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-play-badge.png b/public/docs-static/img/how-to-guides/google-play-badge.png
deleted file mode 100644
index 131f3aca..00000000
Binary files a/public/docs-static/img/how-to-guides/google-play-badge.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-privileges-review.png b/public/docs-static/img/how-to-guides/google-privileges-review.png
deleted file mode 100644
index f66a127a..00000000
Binary files a/public/docs-static/img/how-to-guides/google-privileges-review.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-service-account-create.png b/public/docs-static/img/how-to-guides/google-service-account-create.png
deleted file mode 100644
index 21e0ddb9..00000000
Binary files a/public/docs-static/img/how-to-guides/google-service-account-create.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/google-service-account-privileges.png b/public/docs-static/img/how-to-guides/google-service-account-privileges.png
deleted file mode 100644
index fa8bf3ef..00000000
Binary files a/public/docs-static/img/how-to-guides/google-service-account-privileges.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/api-permissions.png b/public/docs-static/img/how-to-guides/intune-mdm/api-permissions.png
deleted file mode 100644
index e55e4af6..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/api-permissions.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/client-id.png b/public/docs-static/img/how-to-guides/intune-mdm/client-id.png
deleted file mode 100644
index 3b30f171..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/client-id.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/client-secret.png b/public/docs-static/img/how-to-guides/intune-mdm/client-secret.png
deleted file mode 100644
index e48fcd7b..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/client-secret.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/create-app.png b/public/docs-static/img/how-to-guides/intune-mdm/create-app.png
deleted file mode 100644
index 998748ad..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/create-app.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/device-permissions.png b/public/docs-static/img/how-to-guides/intune-mdm/device-permissions.png
deleted file mode 100644
index 020e6308..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/device-permissions.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/getting-started.png b/public/docs-static/img/how-to-guides/intune-mdm/getting-started.png
deleted file mode 100644
index 04099445..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/getting-started.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/grant-permissions.png b/public/docs-static/img/how-to-guides/intune-mdm/grant-permissions.png
deleted file mode 100644
index 0d9a8522..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/grant-permissions.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/granted-permissions.png b/public/docs-static/img/how-to-guides/intune-mdm/granted-permissions.png
deleted file mode 100644
index 96dfb07c..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/granted-permissions.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/groups.png b/public/docs-static/img/how-to-guides/intune-mdm/groups.png
deleted file mode 100644
index 11f9ea67..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/groups.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-mdm/register-app.png b/public/docs-static/img/how-to-guides/intune-mdm/register-app.png
deleted file mode 100644
index 7520cb01..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-mdm/register-app.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-01.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-01.png
deleted file mode 100644
index e738730d..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-01.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-02.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-02.png
deleted file mode 100644
index fc6a4e01..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-02.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-03.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-03.png
deleted file mode 100644
index 41d5be04..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-03.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-04.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-04.png
deleted file mode 100644
index 58d77099..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-04.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-05.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-05.png
deleted file mode 100644
index 0e55e91c..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-05.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-06.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-06.png
deleted file mode 100644
index a901bf40..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-06.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-07.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-07.png
deleted file mode 100644
index e17c8d1a..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-07.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-08.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-08.png
deleted file mode 100644
index 06d3e030..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-08.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-09.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-09.png
deleted file mode 100644
index c9703ab9..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-09.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-10.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-10.png
deleted file mode 100644
index a222ae7c..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-10.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-11.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-11.png
deleted file mode 100644
index 4173f170..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-11.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-12.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-12.png
deleted file mode 100644
index 98a20cab..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-12.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-13.png b/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-13.png
deleted file mode 100644
index 0143737b..00000000
Binary files a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-13.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/netbird-idp-list.png b/public/docs-static/img/how-to-guides/netbird-idp-list.png
deleted file mode 100644
index f9fac70e..00000000
Binary files a/public/docs-static/img/how-to-guides/netbird-idp-list.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/netbird-routes-list-external.png b/public/docs-static/img/how-to-guides/netbird-routes-list-external.png
deleted file mode 100644
index 07dcf38d..00000000
Binary files a/public/docs-static/img/how-to-guides/netbird-routes-list-external.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/netbird-routes-list-local.png b/public/docs-static/img/how-to-guides/netbird-routes-list-local.png
deleted file mode 100644
index b727774a..00000000
Binary files a/public/docs-static/img/how-to-guides/netbird-routes-list-local.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/netstat-routes-grep-external.png b/public/docs-static/img/how-to-guides/netstat-routes-grep-external.png
deleted file mode 100644
index a70c15a1..00000000
Binary files a/public/docs-static/img/how-to-guides/netstat-routes-grep-external.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/netstat-routes-grep-local.png b/public/docs-static/img/how-to-guides/netstat-routes-grep-local.png
deleted file mode 100644
index 83dd71c5..00000000
Binary files a/public/docs-static/img/how-to-guides/netstat-routes-grep-local.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-assign-users-by-group.png b/public/docs-static/img/how-to-guides/okta-assign-users-by-group.png
deleted file mode 100644
index d69b4d7e..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-assign-users-by-group.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-provisioning-enabled.png b/public/docs-static/img/how-to-guides/okta-provisioning-enabled.png
deleted file mode 100644
index 8b3b88f4..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-provisioning-enabled.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-provisioning.png b/public/docs-static/img/how-to-guides/okta-provisioning.png
deleted file mode 100644
index fcc8f2e1..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-provisioning.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-push-groups.png b/public/docs-static/img/how-to-guides/okta-push-groups.png
deleted file mode 100644
index fe21fa02..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-push-groups.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-scim-credentials.png b/public/docs-static/img/how-to-guides/okta-scim-credentials.png
deleted file mode 100644
index ba441802..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-scim-credentials.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-sso-configuration.png b/public/docs-static/img/how-to-guides/okta-sso-configuration.png
deleted file mode 100644
index 5a2afc10..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-sso-configuration.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/okta-to-app-configuration.png b/public/docs-static/img/how-to-guides/okta-to-app-configuration.png
deleted file mode 100644
index 7079fcb4..00000000
Binary files a/public/docs-static/img/how-to-guides/okta-to-app-configuration.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/plan-overusage.png b/public/docs-static/img/how-to-guides/plan-overusage.png
deleted file mode 100644
index aad9f24b..00000000
Binary files a/public/docs-static/img/how-to-guides/plan-overusage.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/policy-office-subnet-with-posturecheck.png b/public/docs-static/img/how-to-guides/policy-office-subnet-with-posturecheck.png
deleted file mode 100644
index c7a73ceb..00000000
Binary files a/public/docs-static/img/how-to-guides/policy-office-subnet-with-posturecheck.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/policy-with-network-posturecheck-added.png b/public/docs-static/img/how-to-guides/policy-with-network-posturecheck-added.png
deleted file mode 100644
index 8cd7ce56..00000000
Binary files a/public/docs-static/img/how-to-guides/policy-with-network-posturecheck-added.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-check-block-network-range.png b/public/docs-static/img/how-to-guides/posture-check-block-network-range.png
deleted file mode 100644
index 5936f3be..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-check-block-network-range.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-check-new-block-network-range.png b/public/docs-static/img/how-to-guides/posture-check-new-block-network-range.png
deleted file mode 100644
index 82c23219..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-check-new-block-network-range.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-01.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-01.png
deleted file mode 100644
index 5a5bb7a3..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-01.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-02.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-02.png
deleted file mode 100644
index 3859bcfe..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-02.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-03.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-03.png
deleted file mode 100644
index 20db14d6..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-03.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-04.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-04.png
deleted file mode 100644
index 37654da7..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-04.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-05.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-05.png
deleted file mode 100644
index 14f5de3c..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-05.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-06.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-06.png
deleted file mode 100644
index ea9af1c1..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-06.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-07.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-07.png
deleted file mode 100644
index e91d7913..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-07.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-08.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-08.png
deleted file mode 100644
index a6d6de86..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-08.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-09.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-09.png
deleted file mode 100644
index 3bd57602..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-09.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-10.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-10.png
deleted file mode 100644
index 0ccaacf5..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-10.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-11.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-11.png
deleted file mode 100644
index c09d5246..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-11.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-12.png b/public/docs-static/img/how-to-guides/posture-checks/posture-checks-12.png
deleted file mode 100644
index d330872c..00000000
Binary files a/public/docs-static/img/how-to-guides/posture-checks/posture-checks-12.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/route-office-subnet-posturecheck.png b/public/docs-static/img/how-to-guides/route-office-subnet-posturecheck.png
deleted file mode 100644
index 01280619..00000000
Binary files a/public/docs-static/img/how-to-guides/route-office-subnet-posturecheck.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/select-network-posture-check.png b/public/docs-static/img/how-to-guides/select-network-posture-check.png
deleted file mode 100644
index ad00931f..00000000
Binary files a/public/docs-static/img/how-to-guides/select-network-posture-check.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/setup-key-create2d.png b/public/docs-static/img/how-to-guides/setup-key-create2d.png
deleted file mode 100644
index 2fb16665..00000000
Binary files a/public/docs-static/img/how-to-guides/setup-key-create2d.png and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/user-invites.gif b/public/docs-static/img/how-to-guides/user-invites.gif
deleted file mode 100644
index 6474efeb..00000000
Binary files a/public/docs-static/img/how-to-guides/user-invites.gif and /dev/null differ
diff --git a/public/docs-static/img/how-to-guides/wifi-inside-office-subnet.png b/public/docs-static/img/how-to-guides/wifi-inside-office-subnet.png
deleted file mode 100644
index 64649867..00000000
Binary files a/public/docs-static/img/how-to-guides/wifi-inside-office-subnet.png and /dev/null differ
diff --git a/public/docs-static/img/overview/associate-peer-groups.png b/public/docs-static/img/manage/access-control/associate-peer-groups.png
similarity index 100%
rename from public/docs-static/img/overview/associate-peer-groups.png
rename to public/docs-static/img/manage/access-control/associate-peer-groups.png
diff --git a/public/docs-static/img/overview/create-rule.png b/public/docs-static/img/manage/access-control/create-rule.png
similarity index 100%
rename from public/docs-static/img/overview/create-rule.png
rename to public/docs-static/img/manage/access-control/create-rule.png
diff --git a/public/docs-static/img/overview/delete-rule-menu.png b/public/docs-static/img/manage/access-control/delete-rule-menu.png
similarity index 100%
rename from public/docs-static/img/overview/delete-rule-menu.png
rename to public/docs-static/img/manage/access-control/delete-rule-menu.png
diff --git a/public/docs-static/img/overview/disable-rule.png b/public/docs-static/img/manage/access-control/disable-rule.png
similarity index 100%
rename from public/docs-static/img/overview/disable-rule.png
rename to public/docs-static/img/manage/access-control/disable-rule.png
diff --git a/public/docs-static/img/groups/create-group-input.png b/public/docs-static/img/manage/access-control/groups/create-group-input.png
similarity index 100%
rename from public/docs-static/img/groups/create-group-input.png
rename to public/docs-static/img/manage/access-control/groups/create-group-input.png
diff --git a/public/docs-static/img/groups/create-group.png b/public/docs-static/img/manage/access-control/groups/create-group.png
similarity index 100%
rename from public/docs-static/img/groups/create-group.png
rename to public/docs-static/img/manage/access-control/groups/create-group.png
diff --git a/public/docs-static/img/groups/delete-group.png b/public/docs-static/img/manage/access-control/groups/delete-group.png
similarity index 100%
rename from public/docs-static/img/groups/delete-group.png
rename to public/docs-static/img/manage/access-control/groups/delete-group.png
diff --git a/public/docs-static/img/groups/rename-group.png b/public/docs-static/img/manage/access-control/groups/rename-group.png
similarity index 100%
rename from public/docs-static/img/groups/rename-group.png
rename to public/docs-static/img/manage/access-control/groups/rename-group.png
diff --git a/public/docs-static/img/groups/view-group-detail.png b/public/docs-static/img/manage/access-control/groups/view-group-detail.png
similarity index 100%
rename from public/docs-static/img/groups/view-group-detail.png
rename to public/docs-static/img/manage/access-control/groups/view-group-detail.png
diff --git a/public/docs-static/img/groups/view-groups.png b/public/docs-static/img/manage/access-control/groups/view-groups.png
similarity index 100%
rename from public/docs-static/img/groups/view-groups.png
rename to public/docs-static/img/manage/access-control/groups/view-groups.png
diff --git a/public/docs-static/img/overview/new-rule-list.png b/public/docs-static/img/manage/access-control/new-rule-list.png
similarity index 100%
rename from public/docs-static/img/overview/new-rule-list.png
rename to public/docs-static/img/manage/access-control/new-rule-list.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-01.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-01.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-01.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-01.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-02.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-02.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-02.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-02.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-03.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-03.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-03.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-03.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-01.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-01.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-01.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-01.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-02.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-02.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-02.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-02.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-03.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-03.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-03.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-03.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-04.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-04.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-04.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-04.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-05.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-05.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-05.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-05.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-06.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-06.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-06.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-06.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-07.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-07.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-07.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-07.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-08.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-08.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-08.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-08.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-09.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-09.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-09.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-09.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-10.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-10.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-10.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-10.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-11.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-11.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-11.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-11.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-12.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-12.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-12.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-12.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-13.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-13.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-13.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-13.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-14.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-14.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-14.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-14.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-15.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-15.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-15.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-15.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-16.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-16.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-16.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-16.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-17.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-17.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-17.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-17.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-18.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-18.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-18.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-18.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-19.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-19.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-19.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-19.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-20.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-20.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-20.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-20.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-21.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-21.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-21.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-21.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-22.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-22.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-22.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-22.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-23.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-23.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-23.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-23.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-24.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-24.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-24.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-24.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-25.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-25.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-25.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-25.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-26.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-26.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-26.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-26.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-27.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-27.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-27.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-27.png
diff --git a/public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-28.png b/public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-28.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-28.png
rename to public/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-28.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-name-domain.png b/public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-name-domain.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-name-domain.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-name-domain.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-permissions.png b/public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-permissions.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-permissions.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-permissions.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-plan.png b/public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-plan.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-plan.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-plan.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-verify-domain.png b/public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-verify-domain.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-new-tenant-verify-domain.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-verify-domain.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-tenant-dns.png b/public/docs-static/img/manage/for-partners/msp-portal/add-tenant-dns.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-tenant-dns.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-tenant-dns.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-tenant-permissions.png b/public/docs-static/img/manage/for-partners/msp-portal/add-tenant-permissions.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-tenant-permissions.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-tenant-permissions.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/add-tenant.png b/public/docs-static/img/manage/for-partners/msp-portal/add-tenant.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/add-tenant.png
rename to public/docs-static/img/manage/for-partners/msp-portal/add-tenant.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenant-already-exists.png b/public/docs-static/img/manage/for-partners/msp-portal/tenant-already-exists.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenant-already-exists.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenant-already-exists.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenant-audit-log.png b/public/docs-static/img/manage/for-partners/msp-portal/tenant-audit-log.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenant-audit-log.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenant-audit-log.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenant-grant-or-deny.png b/public/docs-static/img/manage/for-partners/msp-portal/tenant-grant-or-deny.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenant-grant-or-deny.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenant-grant-or-deny.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenant-switch.png b/public/docs-static/img/manage/for-partners/msp-portal/tenant-switch.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenant-switch.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenant-switch.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenant-usage.png b/public/docs-static/img/manage/for-partners/msp-portal/tenant-usage.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenant-usage.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenant-usage.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenants-closeup.png b/public/docs-static/img/manage/for-partners/msp-portal/tenants-closeup.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenants-closeup.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenants-closeup.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenants-dashboard.png b/public/docs-static/img/manage/for-partners/msp-portal/tenants-dashboard.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenants-dashboard.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenants-dashboard.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenants-switcher.png b/public/docs-static/img/manage/for-partners/msp-portal/tenants-switcher.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenants-switcher.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenants-switcher.png
diff --git a/public/docs-static/img/how-to-guides/msp-portal/tenants.png b/public/docs-static/img/manage/for-partners/msp-portal/tenants.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/msp-portal/tenants.png
rename to public/docs-static/img/manage/for-partners/msp-portal/tenants.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/kubernetes-api-policy.png b/public/docs-static/img/manage/integrations/kubernetes/kubernetes-api-policy.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/kubernetes-api-policy.png
rename to public/docs-static/img/manage/integrations/kubernetes/kubernetes-api-policy.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/kubernetes-api.png b/public/docs-static/img/manage/integrations/kubernetes/kubernetes-api.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/kubernetes-api.png
rename to public/docs-static/img/manage/integrations/kubernetes/kubernetes-api.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/resources-1.png b/public/docs-static/img/manage/integrations/kubernetes/resources-1.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/resources-1.png
rename to public/docs-static/img/manage/integrations/kubernetes/resources-1.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/resources-policy.png b/public/docs-static/img/manage/integrations/kubernetes/resources-policy.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/resources-policy.png
rename to public/docs-static/img/manage/integrations/kubernetes/resources-policy.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key-with-extra-labels.png b/public/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key-with-extra-labels.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key-with-extra-labels.png
rename to public/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key-with-extra-labels.png
diff --git a/public/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key.png b/public/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key.png
rename to public/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-01.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-01.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-01.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-01.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-02.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-02.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-02.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-02.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-03.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-03.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-03.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-03.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-04.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-04.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-04.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-04.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-05.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-05.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-05.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-05.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-06.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-06.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-06.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-06.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-07.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-07.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-07.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-07.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-08.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-08.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-08.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-08.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-09.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-09.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-09.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-09.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-10.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-10.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-10.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-10.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-11.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-11.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-11.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-11.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-12.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-12.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-12.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-12.png
diff --git a/public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-13.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-13.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/deploying-netbird-with-intune/intune-13.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-13.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-14.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-14.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-14.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-14.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-15.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-15.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-15.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-15.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-16.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-16.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-16.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-16.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-17.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-17.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-17.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-17.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-18.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-18.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-18.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-18.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-19.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-19.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-19.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-19.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-20.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-20.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-20.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-20.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-21.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-21.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-21.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-21.png
diff --git a/public/docs-static/img/how-to-guides/intune-netbird-integration/intune-22.png b/public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-22.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/intune-netbird-integration/intune-22.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-22.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-01.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-01.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-01.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-01.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-02.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-02.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-02.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-02.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-03.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-03.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-03.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-03.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-04.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-04.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-04.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-04.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-05.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-05.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-05.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-05.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-06.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-06.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-06.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-06.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-07.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-07.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-07.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-07.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-08.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-08.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-08.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-08.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-09.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-09.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-09.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-09.png
diff --git a/public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-10.png b/public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-10.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/jamf-pro-netbird-integration/netbird-jamf-10.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration/netbird-jamf-10.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-01.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-01.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-01.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-01.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-02.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-02.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-02.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-02.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-03.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-03.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-03.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-03.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-04.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-04.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-04.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-04.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-05 copy.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-05 copy.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-05 copy.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-05 copy.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-05.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-05.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-05.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-05.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-06.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-06.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-06.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-06.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-07.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-07.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-07.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-07.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-08.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-08.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-08.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-08.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-09.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-09.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-09.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-09.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-10.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-10.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-10.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-10.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-11.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-11.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-11.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-11.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-12.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-12.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-12.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-12.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-13.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-13.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-13.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-13.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-14.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-14.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-14.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-14.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-15.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-15.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-15.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-15.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-16.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-16.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-16.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-16.png
diff --git a/public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-17.png b/public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-17.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/kandji-netbird-integration/netbird-kandji-17.png
rename to public/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration/netbird-kandji-17.png
diff --git a/public/docs-static/img/manage/peers/access-infrastructure/ssh-webserver-netbird.png b/public/docs-static/img/manage/peers/access-infrastructure/ssh-webserver-netbird.png
new file mode 100644
index 00000000..7cab0b10
Binary files /dev/null and b/public/docs-static/img/manage/peers/access-infrastructure/ssh-webserver-netbird.png differ
diff --git a/public/docs-static/img/ssh/ssh-client.png b/public/docs-static/img/manage/peers/ssh/ssh-client.png
similarity index 100%
rename from public/docs-static/img/ssh/ssh-client.png
rename to public/docs-static/img/manage/peers/ssh/ssh-client.png
diff --git a/public/docs-static/img/ssh/ssh-dashboard.png b/public/docs-static/img/manage/peers/ssh/ssh-dashboard.png
similarity index 100%
rename from public/docs-static/img/ssh/ssh-dashboard.png
rename to public/docs-static/img/manage/peers/ssh/ssh-dashboard.png
diff --git a/public/docs-static/img/overview/personal-access-token-creation.png b/public/docs-static/img/manage/public-api/personal-access-token-creation.png
similarity index 100%
rename from public/docs-static/img/overview/personal-access-token-creation.png
rename to public/docs-static/img/manage/public-api/personal-access-token-creation.png
diff --git a/public/docs-static/img/overview/personal-access-token-example.png b/public/docs-static/img/manage/public-api/personal-access-token-example.png
similarity index 100%
rename from public/docs-static/img/overview/personal-access-token-example.png
rename to public/docs-static/img/manage/public-api/personal-access-token-example.png
diff --git a/public/docs-static/img/overview/personal-access-token-overview.png b/public/docs-static/img/manage/public-api/personal-access-token-overview.png
similarity index 100%
rename from public/docs-static/img/overview/personal-access-token-overview.png
rename to public/docs-static/img/manage/public-api/personal-access-token-overview.png
diff --git a/public/docs-static/img/overview/service-user-creation.png b/public/docs-static/img/manage/public-api/service-user-creation.png
similarity index 100%
rename from public/docs-static/img/overview/service-user-creation.png
rename to public/docs-static/img/manage/public-api/service-user-creation.png
diff --git a/public/docs-static/img/overview/service-user-overview.png b/public/docs-static/img/manage/public-api/service-user-overview.png
similarity index 100%
rename from public/docs-static/img/overview/service-user-overview.png
rename to public/docs-static/img/manage/public-api/service-user-overview.png
diff --git a/public/docs-static/img/how-to-guides/account-settings-danger-zone.png b/public/docs-static/img/manage/settings/account-settings-danger-zone.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/account-settings-danger-zone.png
rename to public/docs-static/img/manage/settings/account-settings-danger-zone.png
diff --git a/public/docs-static/img/how-to-guides/account-settings-delete-account-confirm.png b/public/docs-static/img/manage/settings/account-settings-delete-account-confirm.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/account-settings-delete-account-confirm.png
rename to public/docs-static/img/manage/settings/account-settings-delete-account-confirm.png
diff --git a/public/docs-static/img/how-to-guides/mfa/mfa-not-enrolled.png b/public/docs-static/img/manage/settings/mfa/mfa-not-enrolled.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/mfa/mfa-not-enrolled.png
rename to public/docs-static/img/manage/settings/mfa/mfa-not-enrolled.png
diff --git a/public/docs-static/img/how-to-guides/mfa/mfa-reset-mfa.png b/public/docs-static/img/manage/settings/mfa/mfa-reset-mfa.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/mfa/mfa-reset-mfa.png
rename to public/docs-static/img/manage/settings/mfa/mfa-reset-mfa.png
diff --git a/public/docs-static/img/how-to-guides/mfa/mfa-settings.png b/public/docs-static/img/manage/settings/mfa/mfa-settings.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/mfa/mfa-settings.png
rename to public/docs-static/img/manage/settings/mfa/mfa-settings.png
diff --git a/public/docs-static/img/how-to-guides/payment-information.png b/public/docs-static/img/manage/settings/payment-information.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/payment-information.png
rename to public/docs-static/img/manage/settings/payment-information.png
diff --git a/public/docs-static/img/how-to-guides/plans-and-billing/calculator.png b/public/docs-static/img/manage/settings/plans-and-billing/calculator.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/plans-and-billing/calculator.png
rename to public/docs-static/img/manage/settings/plans-and-billing/calculator.png
diff --git a/public/docs-static/img/how-to-guides/plans-and-billing/chose-plan.png b/public/docs-static/img/manage/settings/plans-and-billing/chose-plan.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/plans-and-billing/chose-plan.png
rename to public/docs-static/img/manage/settings/plans-and-billing/chose-plan.png
diff --git a/public/docs-static/img/how-to-guides/plans-and-billing/plans-billing-overview.png b/public/docs-static/img/manage/settings/plans-and-billing/plans-billing-overview.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/plans-and-billing/plans-billing-overview.png
rename to public/docs-static/img/manage/settings/plans-and-billing/plans-billing-overview.png
diff --git a/public/docs-static/img/how-to-guides/pricing-overview.png b/public/docs-static/img/manage/settings/pricing-overview.png
similarity index 100%
rename from public/docs-static/img/how-to-guides/pricing-overview.png
rename to public/docs-static/img/manage/settings/pricing-overview.png
diff --git a/public/docs-static/img/manage/team/idp-sync/okta-scim-provisioning.png b/public/docs-static/img/manage/team/idp-sync/okta-scim-provisioning.png
new file mode 100644
index 00000000..6b92a3f4
Binary files /dev/null and b/public/docs-static/img/manage/team/idp-sync/okta-scim-provisioning.png differ
diff --git a/public/docs-static/img/overview/create-group-in-rule.png b/public/docs-static/img/overview/create-group-in-rule.png
deleted file mode 100644
index 21a45879..00000000
Binary files a/public/docs-static/img/overview/create-group-in-rule.png and /dev/null differ
diff --git a/public/docs-static/img/overview/create-rule.png.png b/public/docs-static/img/overview/create-rule.png.png
deleted file mode 100644
index 860986c0..00000000
Binary files a/public/docs-static/img/overview/create-rule.png.png and /dev/null differ
diff --git a/public/docs-static/img/overview/delete-groups.png b/public/docs-static/img/overview/delete-groups.png
deleted file mode 100644
index 7a039ffa..00000000
Binary files a/public/docs-static/img/overview/delete-groups.png and /dev/null differ
diff --git a/public/docs-static/img/overview/delete-rule-popup.png b/public/docs-static/img/overview/delete-rule-popup.png
deleted file mode 100644
index 4d4746ca..00000000
Binary files a/public/docs-static/img/overview/delete-rule-popup.png and /dev/null differ
diff --git a/public/docs-static/img/overview/personal-access-token-creation2.png b/public/docs-static/img/overview/personal-access-token-creation2.png
deleted file mode 100644
index 06c2dba9..00000000
Binary files a/public/docs-static/img/overview/personal-access-token-creation2.png and /dev/null differ
diff --git a/public/docs-static/img/overview/personal-access-token-example2.png b/public/docs-static/img/overview/personal-access-token-example2.png
deleted file mode 100644
index 1c4e540c..00000000
Binary files a/public/docs-static/img/overview/personal-access-token-example2.png and /dev/null differ
diff --git a/public/docs-static/img/overview/personal-access-token-overview2.png b/public/docs-static/img/overview/personal-access-token-overview2.png
deleted file mode 100644
index 2086a0fd..00000000
Binary files a/public/docs-static/img/overview/personal-access-token-overview2.png and /dev/null differ
diff --git a/public/docs-static/img/overview/service-user-creation2.png b/public/docs-static/img/overview/service-user-creation2.png
deleted file mode 100644
index 6e36e208..00000000
Binary files a/public/docs-static/img/overview/service-user-creation2.png and /dev/null differ
diff --git a/public/docs-static/img/overview/service-user-overview2.png b/public/docs-static/img/overview/service-user-overview2.png
deleted file mode 100644
index 6049c08e..00000000
Binary files a/public/docs-static/img/overview/service-user-overview2.png and /dev/null differ
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-interactive-login-app.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-interactive-login-app.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-machine-app.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-machine-app.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-machine-app.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-machine-app.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-grant-types.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-grant-types.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-grant-types.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-grant-types.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-interactive-login-settings.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-interactive-login-settings.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-authorization.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-authorization.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-authorization.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-authorization.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-settings.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-settings.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-settings.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-settings.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-add-user-group.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-add-user-group.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-brand-device-flow.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-brand-device-flow.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-brand-device-flow.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-brand-device-flow.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-device-flow.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-device-flow.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-device-flow.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-device-flow.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-config.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-config.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-type.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-type.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-service-account.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-service-account.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-service-account-details.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-service-account-details.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-application-scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-application-scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-client-secret.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-client-secret.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-client-secret.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-client-secret.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-desktop-uri-setup.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-desktop-uri-setup.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-desktop-uri-setup.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-desktop-uri-setup.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-flows-setup.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-flows-setup.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-flows-setup.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-flows-setup.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-grant-admin-conset.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-grant-admin-conset.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-netbird-api-permisssions.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-netbird-api-permisssions.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-new-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-new-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-new-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-new-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-openid-permissions.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-openid-permissions.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-spa-uri-setup.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure-spa-uri-setup.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/azure_api_scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/azure_api_scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/azure_api_scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/azure_api_scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-assign-role.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-assign-role.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-assign-role.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-assign-role.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-scopes.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-scopes.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-scopes.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-scopes.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-summary.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-summary.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-summary.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-summary.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-type.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-type.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-type.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-type.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-edit-service-account.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-edit-service-account.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-edit-service-account.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-edit-service-account.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-new-role-info.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-new-role-info.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-new-role-info.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-new-role-info.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client-created.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client-created.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client-created.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client-created.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-privileges-review.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-privileges-review.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-privileges-review.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-privileges-review.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-create.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-create.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-create.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-create.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-privileges.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-privileges.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-privileges.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-privileges.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-add-admin-user.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-add-admin-user.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-add-admin-user.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-add-admin-user.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-api-key-generation.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-api-key-generation.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-api-key-generation.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-api-key-generation.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-oidc-app.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-oidc-app.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-oidc-app.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-oidc-app.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-profile.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-profile.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-profile.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-profile.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-configuration.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-configuration.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-configuration.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-configuration.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-user-groups.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-user-groups.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-user-groups.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-user-groups.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-add-client-scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-add-client-scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claims-client.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-domain-token-claims-client.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-access-settings.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-access-settings.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-add-role.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-add-role.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-add-role.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-add-role.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-auth-grant.gif
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-auth-grant.gif
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-auth.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-auth.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-credentials.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-credentials.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-backend-client.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-backend-client.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client-scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client-scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-realm.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-realm.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-user.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-user.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-user.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-user.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-enable-auth.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-enable-auth.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-service-account-role.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-service-account-role.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-set-password.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-set-password.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-set-password.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-set-password.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-generate-token.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-generate-token.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-generate-token.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-generate-token.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-native-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-native-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-native-sign-on-configuration.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-sign-on-configuration.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-native-sign-on-configuration.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-sign-on-configuration.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-new-native-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-native-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-new-native-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-native-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-new-single-page-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-single-page-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-new-single-page-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-single-page-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-single-page-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-page-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-single-page-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-page-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/okta-single-sign-on-configuration.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-sign-on-configuration.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/okta-single-sign-on-configuration.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-sign-on-configuration.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-api-token.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-api-token.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-api-token.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-api-token.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-oidc-client.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-oidc-client.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-oidc-client.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-oidc-client.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-create-user.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-create-user.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-create-user.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-create-user.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-auth.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-auth.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-overview.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-overview.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-uri.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-uri.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-project.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-project.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-project.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-project.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-redirect-settings.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-redirect-settings.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-account-role.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-account-role.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-user-secret.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-user-secret.png
diff --git a/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png b/public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-token-settings.png
similarity index 100%
rename from public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png
rename to public/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-token-settings.png
diff --git a/public/docs-static/img/troubleshooting/turn-test-out.png b/public/docs-static/img/selfhosted/troubleshooting/turn-test-out.png
similarity index 100%
rename from public/docs-static/img/troubleshooting/turn-test-out.png
rename to public/docs-static/img/selfhosted/troubleshooting/turn-test-out.png
diff --git a/public/docs-static/img/troubleshooting/turn.png b/public/docs-static/img/selfhosted/troubleshooting/turn.png
similarity index 100%
rename from public/docs-static/img/troubleshooting/turn.png
rename to public/docs-static/img/selfhosted/troubleshooting/turn.png
diff --git a/src/components/How-To-Guides.jsx b/src/components/How-To-Guides.jsx
index c85ef4c2..701e8be5 100644
--- a/src/components/How-To-Guides.jsx
+++ b/src/components/How-To-Guides.jsx
@@ -3,7 +3,7 @@ import { Heading } from '@/components/Heading'
 
 const howToGuides = [
   {
-    href: '/how-to/getting-started',
+    href: '/get-started',
     name: 'Quickstart guide',
     description: 'Start using NetBird in under 5 minutes.',
   },
@@ -14,29 +14,29 @@ const howToGuides = [
         'Learn how to use access controls to manage access to your machines.',
   },
   {
-    href: '/how-to/add-users-to-your-network',
+    href: '/manage/team/add-users-to-your-network',
     name: 'Add users to your network',
-    description: 'learn how to add team members to your NetBird network.',
+    description: 'Learn how to add team members to your NetBird network.',
   },
   {
-    href: '/how-to/routing-traffic-to-private-networks',
+    href: '/manage/network-routes/routing-traffic-to-private-networks',
     name: 'Route traffic to private networks',
     description:
       'Learn how to provide access to LANs, VPS, and corporate private networks.',
   },
   {
-    href: '/how-to/configuring-default-routes-for-internet-traffic',
+    href: '/manage/network-routes/configuring-default-routes-for-internet-traffic',
     name: 'Configure default routes and traffic for the Internet',
     description: 'Understand how to set up your network for accessing the internet through default routes, also known as "exit nodes".',
   },
   {
-    href: '/how-to/monitor-system-and-network-activity',
+    href: '/manage/activity/traffic-events-logging',
     name: 'Log and monitor network activity',
     description:
       'Learn how to keep track of system and network activities in your account.',
   },
   {
-    href: '/how-to/manage-dns-in-your-network',
+    href: '/manage/dns',
     name: 'Manage DNS in your network',
     description:
         'Learn how to configure name servers in your private network.',
diff --git a/src/components/NavigationDocs.jsx b/src/components/NavigationDocs.jsx
index d2913ef9..a0c03db4 100644
--- a/src/components/NavigationDocs.jsx
+++ b/src/components/NavigationDocs.jsx
@@ -210,10 +210,10 @@ export const docsNavigation = [
              title: 'Settings',
              isOpen: false,
              links: [
-                 {title: 'Authentication', href: '/how-to/enforce-periodic-user-authentication' },
-                 {title: 'Multi-Factor Authentication', href: '/how-to/multi-factor-authentication' },
-                 {title: 'Delete Account', href: '/how-to/delete-account' },
-                 {title: 'Plans and Billing', href: '/how-to/plans-and-billing' }
+                 {title: 'Authentication', href: '/manage/settings/enforce-periodic-user-authentication' },
+                 {title: 'Multi-Factor Authentication', href: '/manage/settings/multi-factor-authentication' },
+                 {title: 'Delete Account', href: '/manage/settings/delete-account' },
+                 {title: 'Plans and Billing', href: '/manage/settings/plans-and-billing' }
                  
              ]
          },
@@ -221,21 +221,21 @@ export const docsNavigation = [
              title: 'Integrations',
              isOpen: false,
              links: [
-                 {title: 'Enable Post Quantum Cryptography', href: '/how-to/enable-post-quantum-cryptography' },
+                 {title: 'Enable Post Quantum Cryptography', href: '/manage/integrations/enable-post-quantum-cryptography' },
                  {
                      title: 'MDM for Deployment',
                      isOpen: true,
                      links: [
-                         {title: 'Deploy with Jamf Pro', href: '/how-to/jamf-pro-netbird-integration' },
-                         {title: 'Deploy with Kandji', href: '/how-to/kandji-netbird-integration' },
-                         {title: 'Deploy with Intune', href: '/how-to/intune-netbird-integration' },
+                         {title: 'Deploy with Jamf Pro', href: '/manage/integrations/mdm-deployment/jamf-pro-netbird-integration' },
+                         {title: 'Deploy with Kandji', href: '/manage/integrations/mdm-deployment/kandji-netbird-integration' },
+                         {title: 'Deploy with Intune', href: '/manage/integrations/mdm-deployment/intune-netbird-integration' },
                      ]
                  },
                  {
                      title: 'Kubernetes',
                      isOpen: true,
                      links: [
-                         {title: 'Operator', href: '/how-to/kubernetes-operator' },
+                         {title: 'Operator', href: '/manage/integrations/kubernetes' },
                      ]
                  },
              ]
@@ -245,7 +245,7 @@ export const docsNavigation = [
                 title: 'Public API',
                 isOpen: false,
                 links: [
-                    { title: 'Access Public API', href: '/how-to/access-netbird-public-api' },
+                    { title: 'Access Public API', href: '/manage/public-api' },
 
                 ]
             },
@@ -254,8 +254,8 @@ export const docsNavigation = [
                 title: 'For Partners',
                 isOpen: false,
                 links: [
-                    { title: 'Managed Service Providers', href: '/how-to/msp-portal' },
-                    { title: 'Acronis NetBird integration', href: '/how-to/acronis-netbird-integration' },
+                    { title: 'Managed Service Providers', href: '/manage/for-partners/msp-portal' },
+                    { title: 'Acronis NetBird integration', href: '/manage/for-partners/acronis-integration' },
 
                 ]
             },
@@ -265,7 +265,7 @@ export const docsNavigation = [
         {
      title: 'CLIENT',
      links: [
-         { title: 'Profiles', href: '/how-to/profiles' },
+         { title: 'Profiles', href: '/client/profiles' },
      ],
  
  },
@@ -301,8 +301,8 @@ export const docsNavigation = [
     {
      title: 'GET MORE HELP',
      links: [
-         { title: 'Troubleshooting client issues', href: '/how-to/troubleshooting-client' },
-         { title: 'Report bugs and issues', href: '/how-to/report-bug-issues' },
+         { title: 'Troubleshooting client issues', href: '/help/troubleshooting-client' },
+         { title: 'Report bugs and issues', href: '/help/report-bug-issues' },
  
      ],
      
diff --git a/src/pages/about-netbird/how-netbird-works.mdx b/src/pages/about-netbird/how-netbird-works.mdx
index ed22b504..5be93eb9 100644
--- a/src/pages/about-netbird/how-netbird-works.mdx
+++ b/src/pages/about-netbird/how-netbird-works.mdx
@@ -20,14 +20,14 @@ A **Peer** is a machine or any device that is connected to the network.
 It can be a Linux server running in the cloud or on-premises, a personal laptop, mobile phone, or even a Raspberry Pi.
 
 <p>
-    <img src="/docs-static/img/architecture/high-level-dia.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/about-netbird/high-level-dia.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 With NetBird clients installed and authorized on the Management service, machines form a mesh network connecting
 to each other directly via an encrypted point-to-point WireGuard tunnel.
 
 <p>
-    <img src="/docs-static/img/architecture/mesh.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/about-netbird/mesh.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 While it is possible to create a full mesh network, it might be not a desirable outcome.
@@ -58,7 +58,7 @@ After that, they are able to establish a connection to the new peer.
 The Management service runs in the cloud NetBird-managed. It can also be self-hosted.
 
 <p>
-    <img src="/docs-static/img/architecture/management.png" alt="management-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/about-netbird/management.png" alt="management-dia" className="imagewrapper-big"/>
 </p>
 
 ### Client Application
@@ -99,7 +99,7 @@ peers need to find each other and exchange the most suitable connection candidat
 This is done through Signal. After a connection has been established, Signal steps out.
 
 <p>
-    <img src="/docs-static/img/architecture/signal.png" alt="signal-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/about-netbird/signal.png" alt="signal-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -115,7 +115,7 @@ The Relay service is a [TURN server](https://webrtc.org/getting-started/turn-ser
 In fact, we use an open-source implementation called [Coturn](https://github.com/coturn/coturn).
 The purpose of the Relay service is to gracefully implement a "Plan B" by relaying traffic between peers when a direct point-to-point connection is not possible. However, starting with v0.29.0, a new WebSocket-based relay has been introduced with the intent of replacing the previous TURN relay (Coturn). [More info](https://netbird.io/knowledge-hub/september-newsletter).
 <p>
-    <img src="/docs-static/img/architecture/relay.png" alt="relay-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/about-netbird/relay.png" alt="relay-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
diff --git a/src/pages/how-to/profiles.mdx b/src/pages/client/profiles.mdx
similarity index 96%
rename from src/pages/how-to/profiles.mdx
rename to src/pages/client/profiles.mdx
index 44ee254d..c2432938 100644
--- a/src/pages/how-to/profiles.mdx
+++ b/src/pages/client/profiles.mdx
@@ -7,10 +7,10 @@ This feature also allows you to switch between self-hosted and cloud-hosted NetB
 to juggle multiple config files.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/profiles/profiles.png" alt="profiles" className="imagewrapper"/>
+    <img src="/docs-static/img/client/profiles/profiles.png" alt="profiles" className="imagewrapper"/>
 </p>
 
-Watch a short demo GIF demonstrating how profile switching works [here](/docs-static/img/how-to-guides/profiles/profiles.gif).
+Watch a short demo GIF demonstrating how profile switching works [here](/docs-static/img/client/profiles/profiles.gif).
 
 ## NetBird Profiles GUI Quickstart
 
@@ -37,7 +37,7 @@ if needed.
 * **Active and default** profiles cannot be removed.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/profiles/manage-profiles.png" alt="profiles" className="imagewrapper"/>
+    <img src="/docs-static/img/client/profiles/manage-profiles.png" alt="profiles" className="imagewrapper"/>
 </p>
 
 ## What Is a Profile?
diff --git a/src/pages/get-started/cli.mdx b/src/pages/get-started/cli.mdx
index 2c72f6fe..bc8fcbfb 100644
--- a/src/pages/get-started/cli.mdx
+++ b/src/pages/get-started/cli.mdx
@@ -477,7 +477,7 @@ For SFTP and SCP, use native clients (`sftp` and `scp` commands) which work with
   ```
 
 <p>
-    <img src="/docs-static/img/ssh/ssh-dashboard.png" alt="netbird ssh dashboard" className="imagewrapper-big" />
+    <img src="/docs-static/img/manage/peers/ssh/ssh-dashboard.png" alt="netbird ssh dashboard" className="imagewrapper-big" />
 </p>
 
 
diff --git a/src/pages/get-started/install/mobile.mdx b/src/pages/get-started/install/mobile.mdx
index abbb56b2..226ea8db 100644
--- a/src/pages/get-started/install/mobile.mdx
+++ b/src/pages/get-started/install/mobile.mdx
@@ -8,7 +8,7 @@ NetBird has an official Android application that you can download at Google Play
 
 <p>
     <a href="https://play.google.com/store/apps/details?id=io.netbird.client" target="_blank">
-        <img src="/docs-static/img/how-to-guides/google-play-badge.png" alt="playstore" className="imagewrapper"/>
+        <img src="/docs-static/img/get-started/mobile/google-play-badge.png" alt="playstore" className="imagewrapper"/>
     </a>
 
 </p>
@@ -21,6 +21,6 @@ NetBird has an official iOS application that you can download from the App Store
 
 <p>
     <a href="https://apps.apple.com/de/app/netbird-p2p-vpn/id6469329339?l=en-GB" target="_blank">
-        <img src="/docs-static/img/how-to-guides/app-store-badge.svg" alt="appstore" className="imagewrapper" style={{ padding: '30px' }}/>
+        <img src="/docs-static/img/get-started/mobile/app-store-badge.svg" alt="appstore" className="imagewrapper" style={{ padding: '30px' }}/>
     </a>
 </p>
diff --git a/src/pages/how-to/report-bug-issues.mdx b/src/pages/help/report-bug-issues.mdx
similarity index 96%
rename from src/pages/how-to/report-bug-issues.mdx
rename to src/pages/help/report-bug-issues.mdx
index 94d74503..7534bc66 100644
--- a/src/pages/how-to/report-bug-issues.mdx
+++ b/src/pages/help/report-bug-issues.mdx
@@ -22,7 +22,7 @@ Steps to reproduce the behavior:
 4. See error
 
 **Have you performed any debugging steps?**
-Learn more at [troubleshooting guide](/how-to/troubleshooting-client)
+Learn more at [troubleshooting guide](/help/troubleshooting-client)
 
 **Expected behavior**
 
diff --git a/src/pages/how-to/troubleshooting-client.mdx b/src/pages/help/troubleshooting-client.mdx
similarity index 98%
rename from src/pages/how-to/troubleshooting-client.mdx
rename to src/pages/help/troubleshooting-client.mdx
index 34b44c80..08a3759c 100644
--- a/src/pages/how-to/troubleshooting-client.mdx
+++ b/src/pages/help/troubleshooting-client.mdx
@@ -170,20 +170,20 @@ To generate a bundle via GUI, you can access the application then go to `Setting
 the wizard to upload the bundle:
 
 <p>
-    <img src="/docs-static/img/troubleshooting-client/ui-settings.png" alt="service-user-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/help/troubleshooting-client/ui-settings.png" alt="service-user-overview" className="imagewrapper-big"/>
 </p>
 <Note>
   If needed, you can update the upload URL and select to anonymize sensitive information like IP addresses and non-netbird.io domains in logs and status output.
 </Note>
 <p>
-    <img src="/docs-static/img/troubleshooting-client/ui-bundle-wizard.png" alt="service-user-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/help/troubleshooting-client/ui-bundle-wizard.png" alt="service-user-overview" className="imagewrapper-big"/>
 </p>
 By default running with trace log enable before generating the bundle is selected. This will restart the client connections and provide a `disconnect to connected` information for our engineers.
 
 If you uncheck this option, a bundle will be generated without running this step. Which is very useful when you have an
 issue that recovers when restarting the client.
 <p>
-    <img src="/docs-static/img/troubleshooting-client/ui-bundle-success.png" alt="service-user-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/help/troubleshooting-client/ui-bundle-success.png" alt="service-user-overview" className="imagewrapper-big"/>
 </p>
 Once the bundle generation is complete, you can click on `Copy Key` to get the uploaded key and share with NetBird\'s team.
 
diff --git a/src/pages/how-to/netflow.mdx b/src/pages/how-to/netflow.mdx
deleted file mode 100644
index 1369a479..00000000
--- a/src/pages/how-to/netflow.mdx
+++ /dev/null
@@ -1,213 +0,0 @@
-# Introduction
-
-NetBird’s **Traffic Events** feature provides a high-level view of traffic flows between network peers and resources.
-It captures connection events on the client (peer) side – for example, when `Peer A` connects to `Peer B` –
-allowing administrators to observe how devices communicate across the NetBird network​.
-The primary purpose of traffic events is to help network admins monitor network activity,
-detect unusual or unauthorized connections, and troubleshoot connectivity issues in their NetBird mesh VPN​.
-Unlike packet capture, **Traffic Events** record metadata about the traffic (addresses, ports, timestamps, etc.) rather than the contents,
-preserving privacy while still giving useful insight​.
-
-By focusing on client-side events, NetBird’s **Traffic Events** show what each peer is doing on the network.
-This includes which peers or services it is contacting, over which protocols, and when.
-Traffic Events are especially useful for verifying that access control policies are working as expected (e.g. confirming that a peer could reach an allowed resource,
-or that blocked traffic wasn’t forwarded).
-In essence, they provide an audit trail of network connections in your NetBird environment,
-helping administrators ensure the network is being used according to policy and to quickly identify
-any anomalies or needed configuration changes.
-
-# Data Collected on Peers
-
-When enabled, a NetBird peer will record metadata for each network flow that it participates in. The data collected typically includes:
-
-* **Timestamp**: When the flow started and ended.
-* **Source and Destination IP Addresses**: The IP of the peer (source) and the IP of the remote endpoint (destination). For peer-to-peer traffic, these will be the NetBird network IPs (e.g. 100.x.x.x addresses of each peer). For traffic to an external resource (like a private server or subnet), the destination might be an IP in that remote network​.
-* **Source and Destination Ports**: The network ports used by the connection (for TCP/UDP flows). ICMP flows will be identified by ICMP type rather than ports​.
-* **Protocol**: The protocol of the traffic, such as TCP, UDP, or ICMP​.
-* **Direction**: Whether the flow was incoming or outgoing​.
-* **Volume of Data**: The amount of data transferred, measured in number of packets and bytes sent/received for the duration of the flow​.
-
-# Kernel Mode vs Userspace Mode
-
-NetBird leverages WireGuard for its tunneling, and it can operate in two modes on client devices: kernel mode or userspace mode.
-In kernel mode, NetBird utilizes the operating system’s WireGuard kernel module (when available) for handling encryption and routing.
-This offers very efficient performance with low overhead, as the heavy lifting is done inside the OS kernel.
-NetBird is designed to take advantage of kernel-mode WireGuard whenever possible for direct peer-to-peer connections​.
-If the kernel module isn’t available or if the platform doesn’t support it (for example, Windows, or certain BSD-based systems),
-NetBird falls back to a userspace implementation of WireGuard (running in the NetBird agent process).
-Userspace mode may introduce slightly higher CPU usage or latency since packets are handled in the application layer rather than the kernel,
-but it ensures compatibility across all environments.
-
-# Log Retention
-
-NetBird does not store Traffic Events indefinitely; instead, we follow a retention policy to
-balance storage use and privacy. By default, traffic event data is retained for 24 hours on the management system,
-after which older records are automatically deleted.
-
-However, while in experimental mode, logs are retained for **48 hours**.
-Additionally, please note that the current API returns a maximum of **50,000 events**.
-We are actively working on expanding this limit in the coming days to support larger datasets and increased usage.
-
-# Log Shipping
-
-To enhance monitoring and centralized analysis, we support shipping Traffic Events to external logging solutions.
-This integration allows you to seamlessly forward Traffic Events from NetBird to DataDog, Amazon S3 or Amazon DataFirehose,
-where you can leverage advanced dashboards, alerting, and analytics to gain deeper insights into your network activity.
-
-# Use Cases
-
-This section outlines common scenarios in which Traffic Events are useful, explaining what administrators can glean in each case.
-We’ll also illustrate some scenarios with examples and screenshots of log data where applicable.
-
-## 1. Peer-to-Peer Connections
-
-When two NetBird peers communicate directly, a traffic event is generated on the peer that initiated the connection.
-This covers basic peer-to-peer traffic such as one workstation pinging another, an SSH session from one server to another,
-or any application data exchanged between two peers over NetBird.
-The log will show the source peer’s NetBird IP and the destination peer’s NetBird IP, along with the protocol and ports used.
-
-#### **1.1. Example of a traffic event for a TCP connection between two peers.**
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/tcp.png)
-In the above example, a peer named `Nevada Windows` opened a TCP connection from source port `52480` to another peer named `acltest` on destination port `80`.
-Each peer would log the event from its perspective – typically, the initiator peer `Peer A` logs it as an outgoing connection and
-the responder peer `acltest` logs it as an incoming connection.
-
-
-#### **1.2. Example of a traffic event for an UDP connection between two peers.**
-
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/udp.png)
-In the case of UDP traffic between peers, the event will similarly record the source/dest IPs and ports and label the protocol as UDP.
-
-#### 1.3. Example of a traffic event for an ICMP connection between two peers.
-
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/icmp.png)
-ICMP flows (like a ping) will appear with protocol ICMP in the logs. For a ping, you’d see the two peers’ IPs and the fact it was ICMP;
-if packet/byte counting is on, you might see a couple of packets (an echo request and reply) recorded.
-
-## 2. Peer-to-Resource Connections
-
-#### 2.1. Peer-To-Host Connection
-
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/peer_to_host.png)
-
-This scenario involves a NetBird peer accessing a specific host resource on an internal network, via a routing peer.
-In NetBird, you can define resources (in Access Control) that are single hosts (single IP addresses) which a peer should be allowed to reach.
-For example, you might have an on-premises service at IP `192.168.0.201` that is not itself running NetBird,
-but one of your NetBird peers `Routing Peer A` is in that network and can route traffic to it.
-Another peer `Peer A` somewhere else is granted access to that host through NetBird.
-When `Peer A` tries to connect (e.g. HTTPS on port 443) to the host resource `192.168.0.201` the traffic will go through `Routing Peer A`
-(which acts as a routing peer for that resource).
-
-Traffic Events are extremely useful here to understand each step:
-
-* On `Peer A`’s log, you would see an outgoing event with destination `192.168.0.201`:443 (for example) over TCP.
-The source would be `Peer A`’s NetBird IP and source port, destination the host’s IP and port 443.
-This confirms that Peer A attempted to reach the server.
-* On `Routing Peer A`’s log, you will see the related event: coming from `Peer A`
-(`Peer A`’s NB IP to `192.168.0.201` on port 443). Routing `Peer A` essentially bridges the two networks,
-so it sees an incoming event and forwards the traffic internally.
-
-**Another Example**: Imagine DNS is disabled on a printer, and a user’s laptop `Peer A` tries to ping the printer’s IP
-via a NetBird routing peer. The logs on `Peer A` would show an ICMP flow to the printer’s IP;
-the routing peer’s logs would show the traffic coming from the laptop and going to the printer.
-If the ping fails, you could see whether the flow reached the printer or not.
-All of this without capturing packets – the flow records give a concise summary of what happened.
-In summary, for peer-to-host resource events, look at the initiating peer’s log for an outbound flow to the host’s IP,
-and the routing peer’s log for the corresponding transit.
-These flows confirm that NetBird is correctly carrying traffic to specific network resources in your network.
-
-#### 2.2. Peer-To-Subnet Connection
-
-Similar to the above, this scenario deals with a peer accessing an entire subnet (range of IPs) via a routing peer.
-NetBird allows administrators to define network routes (or the newer “Networks” feature) where a peer acts as a gateway to a subnet (for example, an office `LAN 10.0.5.0/24`).
-A common use case is site-to-site connectivity or allowing remote peers to access a whole VLAN or VPC through one NetBird node.
-
-In a peer-to-subnet case, the Traffic Events will show when a peer communicates with any IP in the target subnet:
-
-* On the client (peer) side, an outgoing traffic event will appear whenever it sends traffic to an IP within the allowed subnet. For instance,
-if `Peer A` (remote laptop) connects to `10.0.5.100` (an internal server in the subnet),
-`Peer A`’s logs will list a flow with destination `10.0.5.100` (and whatever port/protocol).
-* On the routing peer’s side (the peer that has access to that subnet),
-you’ll again see the flow coming from `Peer A`’s NetBird IP out to the `10.0.5.x` address.
-
-One thing to note is that when a subnet is allowed, a peer might generate many traffic events if it scans 
-or communicates with multiple hosts in that subnet. Each distinct connection (to each IP and port)
-is a separate traffic event. The logs can thus help you map out which internal hosts a remote peer is talking to.
-For example, you might see peer-a accessing `10.0.5.25 (file server)` on `TCP 445`, and also `10.0.5.100` on `TCP 3389 (RDP)`.
-This tells you which services are being used.
-
-Traffic Events in this scenario can highlight if any unexpected access is happening.
-Perhaps a peer is only supposed to use a database, but you see events to a domain controller’s IP – that could be a red flag to investigate.
-Conversely, if a user complains they can’t access anything in the subnet, you could check the traffic events
-if absolutely no traffic events to that subnet appear in their peer log, maybe their client isn’t attempting the connection.
-
-#### 2.3. Peer-To-Domain Connection
-
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/domain.png)
-![NetBird Local Peer](/docs-static/img/how-to-guides/traffic-events/domain_resource.png)
-
-
-NetBird also supports defining resources by domain name – for example,
-an access policy might allow a peer to reach example.com or *.corp.internal.
-In these cases, the NetBird client will handle domain name resolution (often through NetBird’s DNS features)
-and then allow traffic to the resulting IP addresses if they match the domain policy.
-Traffic Events will capture the actual IP connections made, but it’s important to understand how domain-based rules reflect in the logs.
-
-When a peer initiates a connection to an allowed domain (say, intranet.corp.internal), the following happens:
-
-The peer resolves the domain to an IP using the routing peer's embedded resolver.
-The connection proceeds to that IP over the tunnel. The event on the peer will show a connection to that IP address (since that’s what ultimately happens on the network layer).
-
-As a result, an administrator analyzing the logs may see a connection to an IP address, such as 10.8.0.5 on TCP 443,
-with an explicit reference to the domain it was resolved from. 
-
-The event for peer-to-domain scenarios will look just like any other peer-to-host event:
-peer’s NB IP -> some destination IP, protocol, port, bytes.
-The difference is that the allowed destination IP might not be static – it could change
-if the DNS name resolves differently. NetBird, however, will log whatever actual addresses were contacted.
-For example, consider a rule allowing access to pool.ntp.org (which resolves to various IPs).
-If a peer (Peer A) uses that, on Peer A’s log over time you might see events to multiple different IP addresses
-on UDP port 123 (NTP). Each of those events corresponds to the domain resource. 
-
-## 3. Site-to-Site Connections
-
-In a site-to-site setup, NetBird connects two or more networks (sites) each with a routing peer.
-For example, an AWS VPC network and an on-prem network could be linked via their respective NetBird peers,
-so that machines in each site can talk to each other through the NetBird tunnel
-(often without each machine running NetBird – the routing peers relay traffic).
-Traffic Events become a powerful tool to monitor and troubleshoot this inter-site traffic.
-
-Consider two sites: Site A (with subnet 10.1.0.0/16, routing peer = Peer-A) and Site B (with subnet 192.168.1.0/24, routing peer = Peer-B).
-NetBird is configured so that each site’s subnet is accessible to the other via the respective routing peers.
-Now suppose a host in Site A (10.1.0.50) is trying to reach a host in Site B (192.168.1.75) on some service.
-
-Here’s how the Traffic Events play out:
-
-* Peer-A’s logs (routing peer at Site A): Peer-A will log an incoming event from 10.1.0.50 (a host on its LAN)
-going to 192.168.1.75 via the NetBird tunnel.
-* Peer-B’s logs (routing peer at Site B): Correspondingly, Peer-B will log an incoming event from Peer-A (over NetBird)
-destined to 192.168.1.75 on its local network.
-
-Using these logs, you can trace end-to-end connectivity between sites.
-If Site A can’t talk to Site B, check Peer-A’s logs: do we see events attempting to go out?
-If not, the issue might be that the Site A host isn’t routing to Peer-A.
-If yes, then check Peer-B’s logs: did it receive anything?
-If Peer-B’s log is empty for that traffic, then maybe the tunnel is down or ACL is missing.
-If Peer-B got it and forwarded to 192.168.1.75, but no reply came, then the problem is likely on the Site B host or network.
-Essentially, the Traffic Events allow you to break the problem into segments (A -> tunnel, tunnel -> B, B -> host, etc.).
-
-Even in normal operation, site-to-site Traffic Events give visibility into the volume and types of traffic flowing between locations.
-This can be useful for capacity planning or security monitoring.
-For example, if one site suddenly starts sending a lot of data to another at odd hours, the logs on the routing peers will reflect that in bytes and packets counts.
-Administrators might set up external log analysis to alert on unusual site-to-site flow patterns (e.g., a spike in ICMP traffic or large data transfers).
-
-# Privacy and Security Considerations
-**[CHECK] Add this section if needed**
-
-# Conclusion
-
-Traffic Events in NetBird provide network administrators with valuable visibility into the traffic within their secure network, all while operating at a high level that avoids delving into packet contents.
-In this documentation, we covered what Traffic Events are and how they function on NetBird clients:
-they record who is talking to whom, over what, and when, giving you an overview of network activity that is essential for both troubleshooting and security auditing.
-We outlined the data points collected (IPs, ports, timestamps, etc.) and noted that by default NetBird is careful not to log sensitive payload or DNS information, aligning the feature with privacy best practices​.
-
diff --git a/src/pages/ipa/guides/authentication.mdx b/src/pages/ipa/guides/authentication.mdx
index 48feb43b..6df8cb3d 100644
--- a/src/pages/ipa/guides/authentication.mdx
+++ b/src/pages/ipa/guides/authentication.mdx
@@ -18,7 +18,7 @@ Always keep your token safe and reset it if you suspect it has been compromised.
 
 ## Using personal access tokens
 
-When establishing a connection using [PATs](/how-to/access-netbird-public-api), you will need your access token — you can create one in the [NetBird dashboard](https://app.netbird.io/users) under User settings. It is recommended to use [service users](/how-to/access-netbird-public-api) for all organization wide flows calling the API.  Here's how to add the token to the request header using cURL:
+When establishing a connection using [PATs](/manage/public-api), you will need your access token — you can create one in the [NetBird dashboard](https://app.netbird.io/users) under User settings. It is recommended to use [service users](/manage/public-api) for all organization wide flows calling the API.  Here's how to add the token to the request header using cURL:
 
 ```bash {{ title: 'Example request with personal access token' }}
 curl https://api.netbird.io/api/users \
@@ -28,6 +28,6 @@ curl https://api.netbird.io/api/users \
 Always keep your token safe and reset it if you suspect it has been compromised.
 
 <div className="not-prose mb-16 mt-6 flex gap-3">
-    <Button href="/how-to/access-netbird-public-api#creating-an-access-token" arrow="right" children="How to create tokens" />
+    <Button href="/manage/public-api#creating-an-access-token" arrow="right" children="How to create tokens" />
 </div>
 
diff --git a/src/pages/ipa/introduction.mdx b/src/pages/ipa/introduction.mdx
index d983a1f8..5bc71a4c 100644
--- a/src/pages/ipa/introduction.mdx
+++ b/src/pages/ipa/introduction.mdx
@@ -14,12 +14,12 @@ Use the NetBird Public API to manage users, peers, network rules and more from i
 
 ## Getting started {{ anchor: false }}
 
-To get started, it is recommended to create a [service user](/how-to/access-netbird-public-api#creating-a-service-user), that can later be used to communicate with the NetBird API.
+To get started, it is recommended to create a [service user](/manage/public-api#creating-a-service-user), that can later be used to communicate with the NetBird API.
 To be able to send requests to our API you need to [authenticate](/api/guides/authentication) on each request. This can be done either by Bearer token from your identity provider or by creating a [personal access token](/api/guides/authentication#using-personal-access-tokens) in the NetBird dashboard.{{ className: 'lead' }}
 
 <div className="not-prose">
   <Button
-    href="/how-to/access-netbird-public-api#creating-an-access-token"
+    href="/manage/public-api#creating-an-access-token"
     variant="text"
     arrow="right"
     children="Get your personal access token"
diff --git a/src/pages/manage/access-control/manage-network-access.mdx b/src/pages/manage/access-control/manage-network-access.mdx
index a1b9b5e4..dbb25514 100644
--- a/src/pages/manage/access-control/manage-network-access.mdx
+++ b/src/pages/manage/access-control/manage-network-access.mdx
@@ -83,13 +83,13 @@ Starting version `0.48` NetBird supports port ranges in policies, allowing you t
 Make sure to set traffic direction only when TCP or UDP protocols are selected. Finally, provide a name and description for your policy.
 
 <p>
-    <img src="/docs-static/img/overview/create-rule.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/access-control/create-rule.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 If necessary, you can also add a [posture checks](/manage/access-control/posture-checks) to the policy. Posture checks are used to ensure that the peer meets certain security requirements before allowing it to connect. You can select from predefined posture checks or create custom ones.
 
 Once you have finished configuring the policy, click `Add Policy` to save it. You will then see your new policy in the table.
 <p>
-    <img src="/docs-static/img/overview/new-rule-list.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/access-control/new-rule-list.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -105,7 +105,7 @@ If you create a new group when defining a policy, you will need to add a peer to
 You can assign a peer to a group by accessing the `Peers` section. Then, choose the specific peer you want to assign to a group. Click on the `Assigned Groups` select box and select the group(s) you wish to assign to this peer.
 
 <p>
-    <img src="/docs-static/img/overview/associate-peer-groups.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/access-control/associate-peer-groups.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -119,14 +119,14 @@ To update a policy, just click on its name and customize it according to your re
 ### Disabling Policies
 To disable a policy, use the switch in the `Active` column of the table.
 <p>
-    <img src="/docs-static/img/overview/disable-rule.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/access-control/disable-rule.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 ### Deleting Policies
 To delete a policy, click on `Delete` in the table, and confirm the message that appears.
 
 <p>
-    <img src="/docs-static/img/overview/delete-rule-menu.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/access-control/delete-rule-menu.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 ## Managing Groups
@@ -141,7 +141,7 @@ When you see a group input field anywhere in the dashboard (e.g. such as when cr
 2. Press 'Enter' to create the new group
 
 <p>
-    <img src="/docs-static/img/groups/create-group-input.png" alt="Create group inline" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/access-control/groups/create-group-input.png" alt="Create group inline" className="imagewrapper"/>
 </p>
 
 **From Groups Page**<br/>
@@ -150,7 +150,7 @@ When you see a group input field anywhere in the dashboard (e.g. such as when cr
 3. Provide a name for your new group
 
 <p>
-    <img src="/docs-static/img/groups/create-group.png" alt="Create group from groups page" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/access-control/groups/create-group.png" alt="Create group from groups page" className="imagewrapper"/>
 </p>
 
 ### Viewing Groups
@@ -162,7 +162,7 @@ Navigate to `Access Control` > `Groups` to view all groups in your organization.
 - Usage status (used/unused groups)
 
 <p>
-    <img src="/docs-static/img/groups/view-groups.png" alt="Groups overview page" className=""/>
+    <img src="/docs-static/img/manage/access-control/groups/view-groups.png" alt="Groups overview page" className=""/>
 </p>
 
 **Group Details**<br/>
@@ -177,7 +177,7 @@ Navigate to `Access Control` > `Groups` and then click on any group name to view
 - **Setup Keys**: See setup keys with this group as an auto-assigned group
 
 <p>
-    <img src="/docs-static/img/groups/view-group-detail.png" alt="Group details page" className=""/>
+    <img src="/docs-static/img/manage/access-control/groups/view-group-detail.png" alt="Group details page" className=""/>
 </p>
 
 ### Renaming Groups
@@ -192,7 +192,7 @@ Groups synchronized from Identity Providers (Google Workspace, Entra ID, etc.) c
 </Note>
 
 <p>
-    <img src="/docs-static/img/groups/rename-group.png" alt="Rename group" className=""/>
+    <img src="/docs-static/img/manage/access-control/groups/rename-group.png" alt="Rename group" className=""/>
 </p>
 
 ### Deleting Groups
@@ -211,5 +211,5 @@ Groups with active dependencies cannot be deleted. First remove all dependencies
 </Note>
 
 <p>
-    <img src="/docs-static/img/groups/delete-group.png" alt="Delete group" className=""/>
+    <img src="/docs-static/img/manage/access-control/groups/delete-group.png" alt="Delete group" className=""/>
 </p>
\ No newline at end of file
diff --git a/src/pages/manage/control-center/index.mdx b/src/pages/manage/control-center/index.mdx
index b2b115c0..ac93f368 100644
--- a/src/pages/manage/control-center/index.mdx
+++ b/src/pages/manage/control-center/index.mdx
@@ -91,4 +91,4 @@ Use this to see who can access resources in your routed [networks](/manage/netwo
 - [Manage network access with Groups and Access Policies](/manage/access-control/manage-network-access)
 - [Apply posture checks to policies](/manage/access-control/posture-checks)
 - [Networks and routing peers](/manage/networks)
-- [MSP portal overview](/how-to/msp-portal)
+- [MSP portal overview](/manage/for-partners/msp-portal)
diff --git a/src/pages/how-to/acronis-netbird-integration.mdx b/src/pages/manage/for-partners/acronis-integration.mdx
similarity index 89%
rename from src/pages/how-to/acronis-netbird-integration.mdx
rename to src/pages/manage/for-partners/acronis-integration.mdx
index fbcde5f3..6d34ab0e 100644
--- a/src/pages/how-to/acronis-netbird-integration.mdx
+++ b/src/pages/manage/for-partners/acronis-integration.mdx
@@ -36,15 +36,15 @@ For example, let's create an access policy. While the steps are the same for mac
 - Set the source group to `IT Administrators` and the destination group to `Windows Workstations`
 - Configure the protocol and port settings based on required access patterns (e.g., TCP 22 for SSH access to servers, TCP 80 for web servers, etc.)
 
-![Access Control Policy settings](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-01.png)
+![Access Control Policy settings](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-01.png)
 
 Provide a descriptive name for the policy, such as "IT to Windows machines" that indicates its purpose, and click `Save` to create and activate the policy.
 
-![Access Control Policy name](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-02.png)
+![Access Control Policy name](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-02.png)
 
 This access policy will automatically apply to all devices managed by Acronis Cyber Protect Cloud that belong to users in the `IT Administrators` group, providing them secure access to designated resources while preventing lateral movement to unauthorized systems. The policy enforcement occurs at the network level, complementing Acronis Cyber Protect Cloud's device-level monitoring and management capabilities.
 
-![Access Control Policy list](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-03.png)
+![Access Control Policy list](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-03.png)
 
 Moreover, users will only gain this network access when their devices are actively monitored and maintained through Acronis Cyber Protect Cloud, creating a comprehensive security approach where device health monitoring and network access controls work together. This combination ensures that only properly managed and compliant devices can establish secure network connections to protected resources.
 
@@ -60,19 +60,19 @@ This section demonstrates how to create a software package in Acronis Cyber Prot
 
 Log in to Acronis Cyber Protect Cloud, navigate to `SOFTWARE MANAGEMENT > My packages` and click the `Add package` button:
 
-![Add package](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-04.png)
+![Add package](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-04.png)
 
 In the `General information` tab, provide a descriptive name for the package (e.g., "NetBird EXE Installer") and specify the vendor name. Optionally, add a package description and select the appropriate license type from the dropdown menu. Click `Next` to continue.
 
-![General information](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-05.png)
+![General information](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-05.png)
 
 In the `Upload package` tab, enter the installer version (required field) and select the target architecture type. Click the `+ Upload` button in the top right corner to upload the NetBird installer package.
 
-![Upload package](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-06.png)
+![Upload package](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-06.png)
 
 Select the NetBird installer file from your local system. Once the upload completes, click `Next` to proceed.
 
-![Upload package](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-07.png)
+![Upload package](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-07.png)
 
 In the `Install / Uninstall commands` tab, configure the silent installation parameters by entering the following commands:
 
@@ -83,19 +83,19 @@ The `/S` parameter ensures silent installation without user prompts for NetBird'
 
 > **Note**: If you're using NetBird's MSI installer instead of the EXE installer, use `/qn` in the **Installation options** field instead of `"{{full_path}}" /S`. The **Uninstallation options** field remains the same (`{{uninstall_cmd}} /S`) for both installer types. The `/qn` parameter provides quiet installation with no user interface for MSI packages.
 
-![Install / Uninstall commands](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-08.png)
+![Install / Uninstall commands](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-08.png)
 
 In the `Summary` tab, review all package configuration details for accuracy. Check the required boxes to confirm your settings and accept the End User License Agreement (EULA) terms. Click `Next` to proceed.
 
-![Summary](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-09.png)
+![Summary](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-09.png)
 
 The `Digital signature check` tab provides security verification options for the uploaded package. Enable digital signature checking to ensure package integrity and authenticity—this represents a security best practice for enterprise deployments. Click `Add package` to complete the package creation process.
 
-![Digital signature check](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-10.png)
+![Digital signature check](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-10.png)
 
 Acronis will perform the digital signature verification automatically. Once completed, you'll see a `Verified` status next to the NetBird package in your software library.
 
-![My packages list](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-11.png)
+![My packages list](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-11.png)
 
 With the NetBird package successfully added to your Acronis software library, you can now proceed to deploy it across your managed Windows machines.
 
@@ -107,43 +107,43 @@ Acronis Cyber Protect Cloud provides multiple deployment methods for installing
 
 To install NetBird from the available packages, navigate to `SOFTWARE MANAGEMENT > My packages` and click the three-dot menu next to the NetBird package. Select `Install` from the dropdown options.
 
-![Install NetBird from My packages](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-12.png)
+![Install NetBird from My packages](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-12.png)
 
 In the `Deploy software` window, click `+ Add workloads` and select your target machines from the available endpoints.
 
-![Add workloads](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-13.png)
+![Add workloads](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-13.png)
 
 For this example, we selected a single endpoint called `Windows-11`. Click the `Install now` button to begin the immediate deployment process.
 
-![Windows-11 Workload](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-14.png)
+![Windows-11 Workload](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-14.png)
 
 Monitor the installation progress by navigating to `MONITORING > Activities`, where you can track the deployment status across all selected machines.
 
-![Activities menu](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-15.png)
+![Activities menu](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-15.png)
 
 Verify successful installation by navigating to `SOFTWARE MANAGEMENT > Software inventory`, where NetBird should appear in the installed software list for each target machine.
 
-![Software inventory](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-16.png)
+![Software inventory](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-16.png)
 
 **Method 2: Bulk Selection from Device Management**
 
 Alternatively, navigate to `DEVICES > All devices` and select the checkboxes for all target endpoints you want to include in the deployment. Click on any selected device to open the right sidebar, then select `Deploy software`. This approach opens the same `Deploy software` interface with your pre-selected workloads ready for deployment.
 
-![Install NetBird from All devices](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-17.png)
+![Install NetBird from All devices](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-17.png)
 
 **Method 3: Scheduled Deployment Plans**
 
 For more advanced deployment control, use Acronis' deployment plans feature. Navigate to `MANAGEMENT > Software deployment plans` and click `+ Create plan` in the upper right corner.
 
-![Software deployment plans](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-18.png)
+![Software deployment plans](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-18.png)
 
 In the `Create software deployment plan` window, click the pencil icon to customize the plan name, select either `Install` or `Uninstall` under Action, and click `Select software` to add the NetBird package. Configure your preferred deployment schedule by setting the specific date and time for automated execution.
 
-![Create software deployment plan](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-19.png)
+![Create software deployment plan](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-19.png)
 
 After configuring the plan parameters, click `Create` to save the plan for future use, or click `+ Add workloads` to immediately select target endpoints and execute the deployment.
 
-![Selecting workloads](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-20.png)
+![Selecting workloads](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-20.png)
 
 The advantage of deployment plans is that they enable scheduled, repeatable installations across multiple client environments, allowing MSPs to standardize NetBird deployments during designated maintenance windows while maintaining consistent configuration management across all managed endpoints.
 
@@ -255,7 +255,7 @@ Next, on the right sidebar:
 - If needed, Acronis lets you pass `Arguments` to the installer, such as setup keys and the management URL.
 - Once done, set the script's status to `Approved` and click `Save`. 
 
-![Add NetBird EXE PowerShell script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-22.png)
+![Add NetBird EXE PowerShell script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-22.png)
 
 Using a similar procedure, you can add the following script to use the MSI installer instead of the EXE installer:
 
@@ -401,7 +401,7 @@ Write-Host "NetBird MSI installation completed successfully!" -ForegroundColor G
 
 The script downloads the official `.msi` installer and uses the silent flag to install NetBird on Windows machines, just as the `.exe` installer.
 
-![Add NetBird MSI PowerShell script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-23.png)
+![Add NetBird MSI PowerShell script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-23.png)
 
 Likewise, you can add an **Uninstall NetBird** script:
 
@@ -528,7 +528,7 @@ Write-Host "NetBird uninstallation process completed!" -ForegroundColor Green
 
 The script executes `netbird_uninstall.exe` using the silent flag to remove NetBird from Windows endpoints. 
 
-![Add NetBird Uninstaller PowerShell script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-24.png)
+![Add NetBird Uninstaller PowerShell script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-24.png)
 
 If you need to edit or delete any script, you can do it by navigating to `MANAGEMENT > Script repository > My scripts`
 
@@ -540,11 +540,11 @@ As with packages, you can use different methods to deploy NetBird scripts to Win
 
 Navigate to `MANAGEMENT > Script repository > My scripts`, click the three-dot menu on the script you want to install, and select `Script quick run`:
 
-![Script quick run](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-25.png)
+![Script quick run](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-25.png)
 
 Next, you can select the workloads where you want to run the script and click the `Run now` button.
 
-![Run Script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-26.png)
+![Run Script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-26.png)
 
 As before, you can follow the installation progress by navigating to `MONITORING > Activities`.
 
@@ -557,11 +557,11 @@ Navigate to `MANAGEMENT > Scripting plans` and click on `Create plan`. Next:
 - Add the desired workloads
 - Once ready, click the `Create` button.
 
-![Create Scripting Plan](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-27.png)
+![Create Scripting Plan](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-27.png)
 
 From `MANAGEMENT > Scripting plans`, you can click on the three-dot menu of any plan to view its details, edit it, or manually run it.
 
-![Manually Running a Scripting Plan](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-28.png)
+![Manually Running a Scripting Plan](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-28.png)
 
 ## Installing NetBird in macOS using a Bash Script
 
@@ -588,7 +588,7 @@ Configure the following properties in the right sidebar:
 * **Arguments:** If needed, you can pass parameters to the script through the `Arguments` field, such as setup keys for automated enrollment.
 * Once configured, set the script's status to `Approved` and click `Save`.
 
-![Add NetBird Bash Script script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-01.png)
+![Add NetBird Bash Script script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-01.png)
 
 If you need to manage your scripts, you can do it by navigating to `MANAGEMENT > Script repository > My scripts`
 
@@ -604,7 +604,7 @@ Once the script is saved, you can run it on-demand from `My scripts` or add it t
 * Click `Run now` to deploy the script to the chosen devices.
 * To track the installation status, go to `MONITORING > Activities`.
 
-![Quick Run NetBird Bash Script script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-02.png)
+![Quick Run NetBird Bash Script script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-02.png)
 
 **Method 2: Scheduled Scripting Plans**
 
@@ -619,7 +619,7 @@ First, navigate to `MANAGEMENT > Scripting plans` and click `Create plan`.  In t
 
 Once all settings are configured, click `Create` to save and activate the plan.
 
-![Quick Run NetBird Bash Script script](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-macos-03.png)
+![Quick Run NetBird Bash Script script](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-macos-03.png)
 
 Tip: You can manually trigger any plan outside its schedule. Go to `MANAGEMENT > Scripting plans`, find the plan you want to execute, click its three-dot menu, and run it.
 
@@ -633,4 +633,4 @@ To confirm that your Acronis-deployed Windows (or macOS) endpoints successfully
 
 This verification step ensures that your automated deployment process has completed successfully and that devices are ready to enforce the access control policies configured for your organization's security requirements.
 
-![Windows 11 Peer](/docs-static/img/how-to-guides/acronis-windows-netbird-integration/acronis-windows-21.png)
\ No newline at end of file
+![Windows 11 Peer](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-21.png)
\ No newline at end of file
diff --git a/src/pages/how-to/msp-portal.mdx b/src/pages/manage/for-partners/msp-portal.mdx
similarity index 81%
rename from src/pages/how-to/msp-portal.mdx
rename to src/pages/manage/for-partners/msp-portal.mdx
index 9304ec2e..8be9cf6b 100644
--- a/src/pages/how-to/msp-portal.mdx
+++ b/src/pages/manage/for-partners/msp-portal.mdx
@@ -8,7 +8,7 @@ An MSP account is a standard NetBird account with the added 'Tenants' section, a
 With an MSP account, you can also manage your own internal network, just like with a regular NetBird account.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenants.png" alt="tenants" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenants.png" alt="tenants" className="imagewrapper-big"/>
 </p>
 
 The MSP Portal is designed to help you efficiently manage multiple tenant networks, providing a seamless experience for
@@ -16,7 +16,7 @@ switching between tenants and your MSP account. You can do so without the need t
 or inconvenient customer-specific URLs.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-switch.png" alt="tenant-switch" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-switch.png" alt="tenant-switch" className="imagewrapper"/>
 </p>
 
 ## How to Apply for an MSP Account?
@@ -39,13 +39,13 @@ In the 'Tenants' section of your dashboard, click on the 'Add Tenant' button to
 
 1. Provide the tenant's name and domain:
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/add-new-tenant-name-domain.png" alt="add-new-tenant-name-domain" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-name-domain.png" alt="add-new-tenant-name-domain" className="imagewrapper"/>
 </p>
 
 2. Define who can access the tenant account by selecting the user groups of your account and the applicable [user role](/manage/team/add-users-to-your-network#manage-user-roles) when they switch to the tenant. Only users from the selected groups will
 be able to switch to and manage the tenant account.
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/add-new-tenant-permissions.png" alt="add-new-tenant-permissions" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-permissions.png" alt="add-new-tenant-permissions" className="imagewrapper"/>
 </p>
 <Note>
     If a user belongs to multiple groups with different roles, the highest permission role will be applicable.
@@ -58,13 +58,13 @@ be able to switch to and manage the tenant account.
 3. To ensure that you have rights to manage the tenant, you need to verify the ownership of the tenant domain by adding
 a TXT DNS record to the tenant's domain:
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/add-new-tenant-verify-domain.png" alt="add-new-tenant-verify-domain" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-verify-domain.png" alt="add-new-tenant-verify-domain" className="imagewrapper"/>
 </p>
 
 4. Once the domain is verified, select a plan for the tenant.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/add-new-tenant-plan.png" alt="add-new-tenant-plan" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/add-new-tenant-plan.png" alt="add-new-tenant-plan" className="imagewrapper"/>
 </p>
 
 ### Existing Account
@@ -75,12 +75,12 @@ The current account owner will be prompted to grant this access the next time th
 
 1. Press the "Request Access" button if the account already exists:
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-already-exists.png" alt="tenant-already-exists" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-already-exists.png" alt="tenant-already-exists" className="imagewrapper"/>
 </p>
 
 2. Ask the account owner to log in to the dashboard and press "Grant Access"
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-grant-or-deny.png" alt="tenant-grant-or-deny" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-grant-or-deny.png" alt="tenant-grant-or-deny" className="imagewrapper"/>
 </p>
 
 <Note>
@@ -96,7 +96,7 @@ Choose the tenant you want to manage from the dropdown list to switch to the ten
 you to the tenant's network.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-switch.png" alt="tenant-switch" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-switch.png" alt="tenant-switch" className="imagewrapper"/>
 </p>
 
 <Note>
@@ -112,7 +112,7 @@ Note that your user will not appear in the 'Team' -> 'Users' section of the tena
 through the MSP account. However, your user will be visible in the Audit Log, labeled as 'External.'
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-audit-log.png" alt="audit-log" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-audit-log.png" alt="audit-log" className="imagewrapper-big"/>
 </p>
 
 ## Tenant Usage, Billing and Subscription Management
@@ -120,12 +120,12 @@ through the MSP account. However, your user will be visible in the Audit Log, la
 For your convenience, NetBird provides a daily usage overview.
 Please note that the usage displayed in the MSP portal may differ from what you see when switching to a tenant account.
 This is because the MSP portal shows billable usage — meaning only active users and machines are counted
-(see [NetBird plans](/how-to/plans-and-billing#net-bird-plans) for more details).
+(see [NetBird plans](/manage/settings/plans-and-billing#net-bird-plans) for more details).
 
 The usage data is refreshed once per day and reflects the number of users and peers that will be included in your billing at the end of the cycle.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/msp-portal/tenant-usage.png" alt="tenant-usage" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/for-partners/msp-portal/tenant-usage.png" alt="tenant-usage" className="imagewrapper-big"/>
 </p>
 
 Each tenant you add is treated as an individual Stripe subscription under your MSP account. When you go to Manage Plan
diff --git a/src/pages/how-to/enable-post-quantum-cryptography.mdx b/src/pages/manage/integrations/enable-post-quantum-cryptography.mdx
similarity index 100%
rename from src/pages/how-to/enable-post-quantum-cryptography.mdx
rename to src/pages/manage/integrations/enable-post-quantum-cryptography.mdx
diff --git a/src/pages/how-to/kubernetes-operator.mdx b/src/pages/manage/integrations/kubernetes/index.mdx
similarity index 94%
rename from src/pages/how-to/kubernetes-operator.mdx
rename to src/pages/manage/integrations/kubernetes/index.mdx
index 937b37e9..2618685c 100644
--- a/src/pages/how-to/kubernetes-operator.mdx
+++ b/src/pages/manage/integrations/kubernetes/index.mdx
@@ -25,7 +25,7 @@ helm repo add netbirdio https://netbirdio.github.io/helms
 ```shell
 kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.0/cert-manager.yaml
 ```
-3. Add NetBird API token. You can create a PAT by following the steps [here](/how-to/access-netbird-public-api#creating-a-service-user).
+3. Add NetBird API token. You can create a PAT by following the steps [here](/manage/public-api#creating-a-service-user).
 ```shell
 kubectl create namespace netbird
 kubectl -n netbird create secret generic netbird-mgmt-api-key --from-literal=NB_API_KEY=$(cat ~/nb-pat.secret)
@@ -98,7 +98,7 @@ helm upgrade -f values.yaml -n netbird netbird-operator-config netbirdio/netbird
 
 ## Expose Kubernetes Control Plane to your NetBird Network
 To access your Kubernetes control plane from a NetBird network, you can expose your Kubernetes control plane as a
-[NetBird resource](/how-to/networks#resources) by enabling the following option in the netbird-operator-config values:
+[NetBird resource](/manage/networks#resources) by enabling the following option in the netbird-operator-config values:
 
 ```yaml
 kubernetesAPI:
@@ -107,7 +107,7 @@ kubernetesAPI:
 The operator will create a NetBird network resource similar to the example below:
 
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/kubernetes-api.png" alt="API" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/kubernetes-api.png" alt="API" className="imagewrapper-big"/>
 </p>
 
 ## Expose Kubernetes Services to NetBird Network
@@ -143,7 +143,7 @@ spec:
 
 This will create a Network and a resource similar to the example below:
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/resources-1.png" alt="resources" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/resources-1.png" alt="resources" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -201,7 +201,7 @@ kubernetesAPI:
 ```
 After updating and [applying the configuration](#updating-or-modifying-the-operator-configuration), you should see a policy similar to the one below:
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/kubernetes-api-policy.png" alt="resources policy" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/kubernetes-api-policy.png" alt="resources policy" className="imagewrapper-big"/>
 </p>
 
 ### Linking Policy Bases to Kubernetes Services
@@ -229,7 +229,7 @@ spec:
 
 The operator will create a policy in your management account similar to the one below:
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/resources-policy.png" alt="resources policy" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/resources-policy.png" alt="resources policy" className="imagewrapper-big"/>
 </p>
 
 You can reference multiple policy bases using a comma separated list of policy bases: `netbird.io/policy: "app-users,app-admins"`
@@ -278,7 +278,7 @@ To enable sidecar functionality in your deployments, you first need to generate
 or by following [this guide](/manage/peers/register-machines-using-setup-keys) for more details.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key.png" alt="Setup Keys" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key.png" alt="Setup Keys" className="imagewrapper"/>
 </p>
 
 Next, you'll create a secret in Kubernetes and add a new resource called `NBSetupKey`. The `NBSetupKey` name can then be
@@ -331,7 +331,7 @@ Starting with `v0.27.0`, NetBird supports extra DNS labels, allowing you to defi
 To use this feature, create a setup key with the “Allow Extra DNS Labels” option enabled. See the example below for reference:
 
 <p>
-    <img src="/docs-static/img/how-to-guides/kubernetes/side-cars-setup-key-with-extra-labels.png" alt="Setup keys with extra labels" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/integrations/kubernetes/side-cars-setup-key-with-extra-labels.png" alt="Setup keys with extra labels" className="imagewrapper"/>
 </p>
 
 And add the annotation `netbird.io/extra-dns-labels` to your pod; see the example below:
diff --git a/src/pages/how-to/intune-netbird-integration.mdx b/src/pages/manage/integrations/mdm-deployment/intune-netbird-integration.mdx
similarity index 81%
rename from src/pages/how-to/intune-netbird-integration.mdx
rename to src/pages/manage/integrations/mdm-deployment/intune-netbird-integration.mdx
index 5472c467..a3bd352c 100644
--- a/src/pages/how-to/intune-netbird-integration.mdx
+++ b/src/pages/manage/integrations/mdm-deployment/intune-netbird-integration.mdx
@@ -37,11 +37,11 @@ Let's create a policy that enables the `Development` team to access the `Servers
 - Set the source group to `Development` (or the appropriate team group synchronized from Entra ID) and the destination group to `Servers`
 - Configure the protocol and port settings based on required access patterns (e.g., TCP 22 for SSH access to servers)
 
-![Create Access Control Policy](/docs-static/img/how-to-guides/intune-netbird-integration/intune-01.png)
+![Create Access Control Policy](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-01.png)
 
 Provide a descriptive name for the policy, such as "Dev Team Server Access" that indicates its purpose, and click `Save` to create and activate the policy.
 
-![New control access policy](/docs-static/img/how-to-guides/intune-netbird-integration/intune-02.png)
+![New control access policy](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-02.png)
 
 This access policy will automatically apply to all devices enrolled in Intune that belong to users in the `Development` group (as synchronized from **Entra ID**), providing them secure access to designated resources while preventing lateral movement to unauthorized systems.
 
@@ -68,21 +68,21 @@ Using the Win32 method requires you to convert either NetBird's `.exe` or `.msi`
 
 - Sign in to the [Microsoft Intune admin center](https://intune.microsoft.com), navigate to `Apps`, and click the `Windows` button.
 
-![Adding Windows App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-03.png)
+![Adding Windows App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-03.png)
 
 - Click the `+ Create` button to add a new Windows application
 
-![Create Windows App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-04.png)
+![Create Windows App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-04.png)
 
 - In the `App type` dropdown, select `Windows app (Win32)` and click `Select`
 
-![Win32 app](/docs-static/img/how-to-guides/intune-netbird-integration/intune-14.png)
+![Win32 app](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-14.png)
 
 - On the `Add App` screen, click `Select app package file` and browse to the location of the NetBird `.intunewin` file you created earlier
 
 - Select the `.intunewin` file and click `OK`
 
-![Upload NetBird Intunewin](/docs-static/img/how-to-guides/intune-netbird-integration/intune-15.png)
+![Upload NetBird Intunewin](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-15.png)
 
 - On the `App information` tab, configure NetBird with the following values:
 
@@ -97,7 +97,7 @@ Using the Win32 method requires you to convert either NetBird's `.exe` or `.msi`
 
 You can leave the rest of the fields empty.
 
-![NetBird Configuration](/docs-static/img/how-to-guides/intune-netbird-integration/intune-16.png)
+![NetBird Configuration](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-16.png)
 
 - Click `Next` to advance to the `Program` tab. Use the following commands in the install and uninstall fields:
 
@@ -108,14 +108,14 @@ You can leave the rest of the fields empty.
 
 For this example, leave the rest of the configuration unchanged. Note that you can change the install behavior and users' ability to uninstall NetBird if required.
 
-![Program tab](/docs-static/img/how-to-guides/intune-netbird-integration/intune-17.png)
+![Program tab](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-17.png)
 
 - Click `Next` to advance to the `Requirements` tab. Here you can specify the architecture and minimum OS version required for installing NetBird. For instance:
 
 - **Operating system architecture:** 64-bit
 - **Minimum operating system:** Windows 10 22H2
 
-![Requirements tab](/docs-static/img/how-to-guides/intune-netbird-integration/intune-18.png)
+![Requirements tab](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-18.png)
 
 - Click `Next` to advance to the `Detection rules` tab. Intune lets you choose between **using a custom detection script** or **manually configuring detection rules**. Select the latter and configure it as follows:
 
@@ -127,7 +127,7 @@ For this example, leave the rest of the configuration unchanged. Note that you c
 
 Click `OK` when ready.
 
-![Detection Rules tab](/docs-static/img/how-to-guides/intune-netbird-integration/intune-19.png)
+![Detection Rules tab](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-19.png)
 
 For examples on registry-based detection rules, refer to [Intune documentation](https://learn.microsoft.com/en-us/intune/intune-service/apps/apps-win32-add#step-4-detection-rules)
 
@@ -137,19 +137,19 @@ For examples on registry-based detection rules, refer to [Intune documentation](
 
 - On the `Assignments` tab, under `Required`, click `+ Add group`
 
-![Add Groups to NetBird App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-20.png)
+![Add Groups to NetBird App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-20.png)
 
 - Select the appropriate group that contains your users (like the `Development` group synchronized from Entra ID) and click `Select`
 
-![Assign Groups](/docs-static/img/how-to-guides/intune-netbird-integration/intune-09.png)
+![Assign Groups](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-09.png)
 
 - To continue, click `Next`. Review your configuration in the `Review + create` tab, then click `Create` to add NetBird to your Intune app catalog.
 
-![Review Configuration](/docs-static/img/how-to-guides/intune-netbird-integration/intune-21.png)
+![Review Configuration](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-21.png)
 
 - To verify that NetBird was added to Intune, navigate to `Apps > All Apps` to see your Windows applications:
 
-![Windows App Catalog](/docs-static/img/how-to-guides/intune-netbird-integration/intune-22.png)
+![Windows App Catalog](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-22.png)
 
 ## Deploying NetBird as a Line-of-business (LOB) App
 
@@ -160,20 +160,20 @@ As a simpler alternative to the Win32 method described previously, you can deplo
 - Download the NetBird Windows MSI installer from the [NetBird installation documentation](https://docs.netbird.io/get-started/install/windows)
 - Sign in to the [Microsoft Intune admin center](https://intune.microsoft.com), navigate to `Apps`, and click the `Windows` button.
 
-![Adding Windows App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-03.png)
+![Adding Windows App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-03.png)
 
 - Click the `+ Create` button to add a new Windows application
 
-![Create Windows App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-04.png)
+![Create Windows App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-04.png)
 
 - In the `App type` dropdown, select `Line-of-business app` and click `Select`
 
-![LOB app](/docs-static/img/how-to-guides/intune-netbird-integration/intune-05.png)
+![LOB app](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-05.png)
 
 - On the `Add App` screen, click `Select app package file` and browse to the location of the NetBird MSI file you downloaded earlier
 - Select the NetBird MSI installer and click `OK`
 
-![Upload NetBird MSI](/docs-static/img/how-to-guides/intune-netbird-integration/intune-06.png)
+![Upload NetBird MSI](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-06.png)
 
 Click `Next` to configure NetBird with the following details:
 
@@ -189,27 +189,27 @@ Click `Next` to configure NetBird with the following details:
 
 You can leave the rest of the fields empty.
 
-![NetBird Configuration](/docs-static/img/how-to-guides/intune-netbird-integration/intune-07.png)
+![NetBird Configuration](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-07.png)
 
 When ready, click `Next` to proceed to the `Assignments` tab. Under `Required`, click `+ Add group`
 
-![Add Groups to NetBird App](/docs-static/img/how-to-guides/intune-netbird-integration/intune-08.png)
+![Add Groups to NetBird App](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-08.png)
 
 - Select the appropriate group that contains your users (like the `Development` group synchronized from Entra ID) and click `Select`
 
-![Assign Groups](/docs-static/img/how-to-guides/intune-netbird-integration/intune-09.png)
+![Assign Groups](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-09.png)
 
 - To continue, click `Next`. Review your configuration in the `Review + create` tab, then click `Create` to add NetBird to your Intune app catalog.
 
-![Review Configuration](/docs-static/img/how-to-guides/intune-netbird-integration/intune-11.png)
+![Review Configuration](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-11.png)
 
 After adding NetBird, you'll see an overview screen for the NetBird app, showing deployment status and management options.
 
-![NetBird App Overview](/docs-static/img/how-to-guides/intune-netbird-integration/intune-12.png)
+![NetBird App Overview](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-12.png)
 
 To verify that NetBird was added to Intune, navigate to `Home > Apps | Windows` to see all your Windows applications:
 
-![Windows App Catalog](/docs-static/img/how-to-guides/intune-netbird-integration/intune-13.png)
+![Windows App Catalog](/docs-static/img/manage/integrations/mdm-deployment/intune-netbird-integration/intune-13.png)
 
 ### Deploying NetBird to Other Platforms
 
diff --git a/src/pages/how-to/jamf-pro-netbird-integration.mdx b/src/pages/manage/integrations/mdm-deployment/jamf-pro-netbird-integration.mdx
similarity index 85%
rename from src/pages/how-to/jamf-pro-netbird-integration.mdx
rename to src/pages/manage/integrations/mdm-deployment/jamf-pro-netbird-integration.mdx
index 053b5a62..b34fed6d 100644
--- a/src/pages/how-to/jamf-pro-netbird-integration.mdx
+++ b/src/pages/manage/integrations/mdm-deployment/jamf-pro-netbird-integration.mdx
@@ -38,11 +38,11 @@ For this tutorial, we'll create a policy that allows the `Support` team to acces
 * Set the source group to `Support` and the destination group to `Servers`.
 * Configure the appropriate protocol and port settings (e.g., TCP 22 for SSH access).
 
-![Access control policy for the support team](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-01.png)
+![Access control policy for the support team](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-01.png)
 
 Give the policy a descriptive name (e.g., "Support team remote access") and click `Save` to create the policy.
 
-![Access control policies list](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-02.png)
+![Access control policies list](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-02.png)
 
 With this policy in place, any device assigned to the `Support` group will gain access to the `Servers` group as defined in the Access Control Policy.
 
@@ -68,7 +68,7 @@ In the `Options` tab:
 
 Click `Save` to finish. If you see the message "Availability pending", click `Refresh` to update the package status.
 
-![Uploading NetBird package](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-03.png)
+![Uploading NetBird package](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-03.png)
 
 ### Creating a Policy for NetBird
 
@@ -84,29 +84,29 @@ In the **Trigger** options, check the following boxes:
 
 These trigger selections ensure NetBird is installed promptly and remains current on all managed devices. Leave the remaining options as default.
 
-![Jamf Pro policies, general section](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-04.png)
+![Jamf Pro policies, general section](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-04.png)
 
 In the `Packages` section, click `Configure` and add the corresponding NetBird package:
 
-![Jamf Pro policies, packages section](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-05.png)
+![Jamf Pro policies, packages section](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-05.png)
 
 Accept the default values for **Distribution Point** and **Action**
 
-![Jamf Pro policies, packages section](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-06.png)
+![Jamf Pro policies, packages section](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-06.png)
 
 In the `Scope` tab, specify the target computers (all computers, specific computers or groups, etc.). For simplicity in this example, use `All Computers`.
 
-![Jamf Pro policies, target computers](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-07.png)
+![Jamf Pro policies, target computers](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-07.png)
 
 Optionally, in the `User Interaction` tab:
 * Enter messages to display before and after the policy runs.
 * This can help inform users about the installation process.
 
-![Jamf Pro policies, user interaction](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-08.png)
+![Jamf Pro policies, user interaction](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-08.png)
 
 Click `Save` to finish.
 
-![NetBird policy](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-09.png)
+![NetBird policy](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-09.png)
 
 This configuration ensures NetBird is installed as soon as any machine enrolls, maintaining security across your device fleet. 
 
@@ -133,7 +133,7 @@ After setting up NetBird deployment policy in Jamf Pro, it's crucial to verify t
 * In the device details, go to the `Management` tab and locate the `Policies` section.
 * Look for the NetBird policy in the list of applied policies.
 
-![Jamf Pro, confirming NetBird is installed](/docs-static/img/how-to-guides/jamf-pro-netbird-integration//netbird-jamf-10.png)
+![Jamf Pro, confirming NetBird is installed](/docs-static/img/manage/integrations/mdm-deployment/jamf-pro-netbird-integration//netbird-jamf-10.png)
 
 If you see the NetBird policy listed, that would indicate that NetBird has been successfully installed on the device.
 
diff --git a/src/pages/how-to/kandji-netbird-integration.mdx b/src/pages/manage/integrations/mdm-deployment/kandji-netbird-integration.mdx
similarity index 83%
rename from src/pages/how-to/kandji-netbird-integration.mdx
rename to src/pages/manage/integrations/mdm-deployment/kandji-netbird-integration.mdx
index ba35b0f2..4225f6db 100644
--- a/src/pages/how-to/kandji-netbird-integration.mdx
+++ b/src/pages/manage/integrations/mdm-deployment/kandji-netbird-integration.mdx
@@ -28,11 +28,11 @@ For instance, let's suppose you want to create a policy that allows the `Support
 * Set the source group to `Support` and the destination group to `Servers`.
 * Choose the appropriate protocol and port settings (e.g., TCP 22).
 
-![Creating a new access policy for the Support team](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-01.png)
+![Creating a new access policy for the Support team](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-01.png)
 
 Give the policy a descriptive name (e.g., Support team remote access) and click `Save` to create the policy.
 
-![Support team access policy](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-02.png)
+![Support team access policy](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-02.png)
 
 Now that you've configured NetBird, let's shift the focus to Kandji MDM integration and set up the automated deployment of NetBird on support team devices.
 
@@ -40,13 +40,13 @@ Now that you've configured NetBird, let's shift the focus to Kandji MDM integrat
 
 Navigate to `Library` and click `Add new`. Then, find and select `Custom Apps` and click `Add & Configure` to deploy a new [Custom App](https://www.support.kandji.io/support/solutions/articles/72000559807-deploying-custom-apps).
 
-![Creating a new Custom App in Kandji](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-04.png)
+![Creating a new Custom App in Kandji](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-04.png)
 
 Give the Custom App a descriptive name (e.g., NetBird_vX.XX_Support_Team, where X.XX is the current version of NetBird being deployed). Scroll down to **Install Details**, where you'll see different options.
 
 Select `Installer Package` to install NetBird using the official macOS package. Using a package ensures you're installing the exact same version on all devices. This example uses the Apple Silicon package that you can download [here](https://pkgs.netbird.io/macos/arm64). Drag the file to the `Installer Package` field box to upload it to Kandji MDM.
 
-![Creating a new Custom App in Kandji](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-05.png)
+![Creating a new Custom App in Kandji](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-05.png)
 
 Next, click on `Add Preinstall Script` and paste the following code:
 
@@ -141,41 +141,41 @@ For instance, you can [create tags](https://www.support.kandji.io/support/soluti
 
 To create a tag in Kandji MDM, go to `DEVICES`, click on the hamburger menu at the top right, and select `Manage tags`:
 
-![Manage Tags in Kandji](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-06.png)
+![Manage Tags in Kandji](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-06.png)
 
 A new pop-up window will appear; click `+ Add tag`, enter a name for the tag (e.g., `Support`), and click `Save`.
 
-![Creating a new Tag](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-07.png)
+![Creating a new Tag](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-07.png)
 
 Navigate to the `BLUEPRINTS` section in Kandji and click the `New Blueprint` dropdown. Select `New Assignment Map` from the options. In the new window, you'll be presented with preconfigured templates or the option to start a new Blueprint from scratch. For this custom NetBird deployment, choose to start a new Blueprint from scratch.
 
-![Creating a new Blueprint](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-08.png)
+![Creating a new Blueprint](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-08.png)
 
 Give the Blueprint a descriptive name (e.g., NetBird_Apple_Silicon) and click `Create Blueprint`. This action will open Kandji's visual Blueprint builder, where you'll configure the deployment logic for NetBird.
 
 Click `Edit assignments` to start editing the Blueprint.
 
-![Blank Blueprint](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-09.png)
+![Blank Blueprint](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-09.png)
 
 You'll see a list of apps from the library on the left, including the recently created NetBird custom app. To implement the deployment logic, hover over the `+` sign and click it to add a new conditional block. This block will determine which devices receive the NetBird installation based on specific criteria.
 
-![Add new Block to the Blueprint](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-10.png)
+![Add new Block to the Blueprint](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-10.png)
 
 Next, click the pencil icon to edit the rules.
 
-![Add Logic to the Blueprint](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-11.png)
+![Add Logic to the Blueprint](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-11.png)
 
 In the **Assignment Rules** window, configure the conditions for NetBird installation. Use the `Support` tag to trigger the deployment, ensuring NetBird is installed only on devices assigned to the support team. Press `Confirm` to continue.
 
-![Using Tags to target the support team](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-12.png)
+![Using Tags to target the support team](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-12.png)
 
 Back to the visual Blueprint builder, locate the NetBird custom app and drag it into the newly created conditional block. This action associates the NetBird installation with the specified deployment criteria for the support team.
 
-![Add NetBird custom app to Blueprint logic](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-13.png)
+![Add NetBird custom app to Blueprint logic](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-13.png)
 
 Click `Save` to update the Blueprint with the new logic. This action also assigns the Blueprint to the NetBird custom app, finalizing the deployment pipeline configuration. 
 
-![Finished Blueprint](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-14.png)
+![Finished Blueprint](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-14.png)
 
 ## Testing and Verifying the Automated Provisioning Pipeline
 
@@ -183,10 +183,10 @@ Kandji checks devices every 15 minutes by default, so any device tagged with `Su
 
 To verify the deployment pipeline, navigate to `DEVICES` in Kandji, select an enrolled device, and click `Edit device details` > `Edit tags`. Assign the `Support` tag to trigger the NetBird installation. 
 
-![Verifying Blueprint logic](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-15.png)
+![Verifying Blueprint logic](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-15.png)
 
 You can also confirm the process in NetBird. Log in to a NetBird account with administrative privileges, navigate to the `Peers` section, and look for the new device.
 
-![Verifying peer in NetBird](/docs-static/img/how-to-guides/kandji-netbird-integration//netbird-kandji-16.png)
+![Verifying peer in NetBird](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-16.png)
 
 In this tutorial, you've learned how to integrate NetBird's VPN solution with Kandji MDM for Apple devices. By configuring NetBird Access Policies, creating Kandji MDM Blueprints, and setting up an automated deployment pipeline, you've established a robust system for managing network access across your organization.
\ No newline at end of file
diff --git a/src/pages/manage/networks/index.mdx b/src/pages/manage/networks/index.mdx
index 2856f089..39e8f5a9 100644
--- a/src/pages/manage/networks/index.mdx
+++ b/src/pages/manage/networks/index.mdx
@@ -58,7 +58,7 @@ a domain name (eg: `example.com`) or a wildcard domain (eg: `*.example.com`) in
 put an IP address range. Then NetBird clients will start responding to and routing the given domain.
 
 Please consult the
-[Debugging access to Domain Resources](/how-to/troubleshooting-client#debugging-access-to-domain-resources)
+[Debugging access to Domain Resources](/help/troubleshooting-client#debugging-access-to-domain-resources)
 documentation to troubleshoot common issues with this type of resources yourself.
 
 <Note>
@@ -86,7 +86,7 @@ On a technical level the feature works as follows:
      the result.
    4. the Local DNS Forwarder sets up routing rules for IP addresses returned from the query, 
       before returning them to the Application
-      - see [Trigger the Domain Resource](/how-to/troubleshooting-client#trigger-the-domain-resource)
+      - see [Trigger the Domain Resource](/help/troubleshooting-client#trigger-the-domain-resource)
         to observe this behaviour "in action".
 3. the Application receives the result "as usual", except for a slight delay before all of the above takes place the
   first time a domain name is requested,
diff --git a/src/pages/manage/peers/access-infrastructure/secure-remote-webserver-access.mdx b/src/pages/manage/peers/access-infrastructure/secure-remote-webserver-access.mdx
index f598e77b..c9963c29 100644
--- a/src/pages/manage/peers/access-infrastructure/secure-remote-webserver-access.mdx
+++ b/src/pages/manage/peers/access-infrastructure/secure-remote-webserver-access.mdx
@@ -153,7 +153,7 @@ There is no response from the host. Now, ping the web server from your configure
 
 As expected, all packets were transmitted. Now, you can securely SSH into your remote web server from your local peer, either using the NetBird-assigned domain name or IP address:
 
-![Terminal SSH into Web Server using NetBird domain](https://imgur.com/itP1poM.png)
+![Terminal SSH into Web Server using NetBird domain](/docs-static/img/manage/peers/access-infrastructure/ssh-webserver-netbird.png)
 
 This straightforward test confirms your successful implementation of a secure, firewall-free connection to your remote web server via NetBird, demonstrating its power in simplifying robust network security.
 
diff --git a/src/pages/manage/peers/ssh.mdx b/src/pages/manage/peers/ssh.mdx
index 7b080f89..b4dbfee7 100644
--- a/src/pages/manage/peers/ssh.mdx
+++ b/src/pages/manage/peers/ssh.mdx
@@ -67,7 +67,7 @@ On the machine you want to access via SSH, enable the NetBird SSH server.
 3. Click on **Allow SSH** to enable the SSH server
 
 <p>
-    <img src="/docs-static/img/ssh/ssh-client.png" alt="netbird ssh client"
+    <img src="/docs-static/img/manage/peers/ssh/ssh-client.png" alt="netbird ssh client"
          className="imagewrapper"/>
 </p>
 
@@ -121,7 +121,7 @@ Enable SSH on individual peers:
 3. Save the changes
 
 <p>
-    <img src="/docs-static/img/ssh/ssh-dashboard.png"
+    <img src="/docs-static/img/manage/peers/ssh/ssh-dashboard.png"
          alt="netbird ssh dashboard" className="imagewrapper-big"/>
 </p>
 
diff --git a/src/pages/how-to/access-netbird-public-api.mdx b/src/pages/manage/public-api/index.mdx
similarity index 82%
rename from src/pages/how-to/access-netbird-public-api.mdx
rename to src/pages/manage/public-api/index.mdx
index 2f7805d9..565bd0b1 100644
--- a/src/pages/how-to/access-netbird-public-api.mdx
+++ b/src/pages/manage/public-api/index.mdx
@@ -22,14 +22,14 @@ The most common usage scenarios:
 
 To create a service user, you'll need to log in to your organization's account at https://app.netbird.io and navigate to the "Team" -> "Service Users" section of your account.
 <p>
-    <img src="/docs-static/img/overview/service-user-overview.png" alt="service-user-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/public-api/service-user-overview.png" alt="service-user-overview" className="imagewrapper-big"/>
 </p>
 
 From there, you can create a new service user and specify a role that the user should have.
 User role allows read-only access, use the admin for write access.
 
 <p>
-    <img src="/docs-static/img/overview/service-user-creation.png" alt="service-user-creation-popup" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/public-api/service-user-creation.png" alt="service-user-creation-popup" className="imagewrapper"/>
 </p>
 ‚
 <Note>
@@ -41,20 +41,20 @@ User role allows read-only access, use the admin for write access.
 To create an access token, you'll need to log in to your account and navigate to the "Team" section and look for your user or create a [service user](#service-users) to use for your API requests.
 
 <p>
-    <img src="/docs-static/img/overview/personal-access-token-overview.png" alt="personal-access-token-overview" width="780" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/public-api/personal-access-token-overview.png" alt="personal-access-token-overview" width="780" className="imagewrapper-big"/>
 </p>
 
 From there, you can create a new token and specify expiration for the token. You won't be able to modify your token.
 
 <p>
-    <img src="/docs-static/img/overview/personal-access-token-creation.png" alt="personal-access-creation-popup" width="400" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/public-api/personal-access-token-creation.png" alt="personal-access-creation-popup" width="400" className="imagewrapper"/>
 </p>
 
 After the token was generated successfully you will see a plain version of your token to copy and store in a secure place.
 Be aware that once you close the popup it is impossible to see the plain version of the token again as NetBird only stores a hashed version of the token.
 
 <p>
-    <img src="/docs-static/img/overview/personal-access-token-example.png" alt="personal-access-token-example" width="400" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/public-api/personal-access-token-example.png" alt="personal-access-token-example" width="400" className="imagewrapper"/>
 </p>
 
 <Note>
diff --git a/src/pages/how-to/delete-account.mdx b/src/pages/manage/settings/delete-account.mdx
similarity index 83%
rename from src/pages/how-to/delete-account.mdx
rename to src/pages/manage/settings/delete-account.mdx
index d8abb479..5c6a67da 100644
--- a/src/pages/how-to/delete-account.mdx
+++ b/src/pages/manage/settings/delete-account.mdx
@@ -9,11 +9,11 @@ To delete your NetBird organization account, you must be a user with the [owner
 
     Go to the `Settings` tab, then click on `Danger Zone`. Review the message and click on the `Delete Account` button.
 <p>
-    <img src="/docs-static/img/how-to-guides/account-settings-danger-zone.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/account-settings-danger-zone.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
     To confirm, click on the `Delete` button.
 <p>
-    <img src="/docs-static/img/how-to-guides/account-settings-delete-account-confirm.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/manage/settings/account-settings-delete-account-confirm.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 
diff --git a/src/pages/how-to/enforce-periodic-user-authentication.mdx b/src/pages/manage/settings/enforce-periodic-user-authentication.mdx
similarity index 100%
rename from src/pages/how-to/enforce-periodic-user-authentication.mdx
rename to src/pages/manage/settings/enforce-periodic-user-authentication.mdx
diff --git a/src/pages/how-to/multi-factor-authentication.mdx b/src/pages/manage/settings/multi-factor-authentication.mdx
similarity index 89%
rename from src/pages/how-to/multi-factor-authentication.mdx
rename to src/pages/manage/settings/multi-factor-authentication.mdx
index 93c1a761..d383ed3a 100644
--- a/src/pages/how-to/multi-factor-authentication.mdx
+++ b/src/pages/manage/settings/multi-factor-authentication.mdx
@@ -20,7 +20,7 @@ After enabling, you can `Logout` and log back in to see the MFA prompt.
 - If a user is not part of the account and MFA is enabled, the first-time `Sign Up` will not require MFA. <br /> Only subsequent logins will require MFA.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/mfa/mfa-settings.png" alt="MFA Settings" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/mfa/mfa-settings.png" alt="MFA Settings" className="imagewrapper-big"/>
 </p>
 
 
@@ -37,7 +37,7 @@ Click on a specific user to see their MFA status.
 - `Not enrolled` - MFA is enabled but user **has not completed** the MFA setup yet.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/mfa/mfa-not-enrolled.png" alt="MFA Status" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/mfa/mfa-not-enrolled.png" alt="MFA Status" className="imagewrapper-big"/>
 </p>
 
 ## Reset MFA
@@ -50,7 +50,7 @@ This will reset MFA for the user, and they will need to set it up again during t
 </Note>
 
 <p>
-    <img src="/docs-static/img/how-to-guides/mfa/mfa-reset-mfa.png" alt="MFA Reset" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/mfa/mfa-reset-mfa.png" alt="MFA Reset" className="imagewrapper-big"/>
 </p>
 
 ## Get started
diff --git a/src/pages/how-to/plans-and-billing.mdx b/src/pages/manage/settings/plans-and-billing.mdx
similarity index 83%
rename from src/pages/how-to/plans-and-billing.mdx
rename to src/pages/manage/settings/plans-and-billing.mdx
index ea4e4a5e..7c0ede20 100644
--- a/src/pages/how-to/plans-and-billing.mdx
+++ b/src/pages/manage/settings/plans-and-billing.mdx
@@ -13,7 +13,7 @@ It features peer-to-peer connections and encryption, access control, routing, an
 
 
 <p>
-    <img src="/docs-static/img/how-to-guides/pricing-overview.png" alt="pricing-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/pricing-overview.png" alt="pricing-overview" className="imagewrapper-big"/>
 </p>
 
 Details can be found on our [pricing page](https://netbird.io/pricing).
@@ -33,7 +33,7 @@ If the next month only 70 connect, you pay for 70 users.
 Refer to our pricing calculator on the [pricing page](https://netbird.io/pricing#calculator) to estimate your monthly costs based on your expected usage.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/plans-and-billing/calculator.png" alt="pricing-calculator" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/plans-and-billing/calculator.png" alt="pricing-calculator" className="imagewrapper-big"/>
 </p>
 
 ## Machine-based Usage
@@ -61,14 +61,14 @@ automatically adjust the machine costs as detailed in the following sections.
 To start or change your current plan, navigate to `Settings` > `Plans & Billing` and choose the plan you wish to upgrade or downgrade to.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/plans-and-billing/chose-plan.png" alt="chose-plan" width="780" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/plans-and-billing/chose-plan.png" alt="chose-plan" width="780" className="imagewrapper-big"/>
 </p>
 
 **Payment Information**
 
 Next, you'll be directed to enter your payment information. Available payment options currently include credit cards, Google Pay, and Link.
 <p>
-    <img src="/docs-static/img/how-to-guides/payment-information.png" alt="payment-information" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/payment-information.png" alt="payment-information" className="imagewrapper-big"/>
 </p>
 
 
@@ -78,7 +78,7 @@ Next, you'll be directed to enter your payment information. Available payment op
 After successfully submitting your payment information, the updated version of your plan will be reflected in your account.
 
 <p>
-    <img src="/docs-static/img/how-to-guides/plans-and-billing/plans-billing-overview.png" alt="plans-billing-overview" className="imagewrapper-big"/>
+    <img src="/docs-static/img/manage/settings/plans-and-billing/plans-billing-overview.png" alt="plans-billing-overview" className="imagewrapper-big"/>
 </p>
 
 
@@ -98,4 +98,4 @@ Your subscription cycle starts on the first day of your original subscription. I
 
 ## Deleting an Account
 
-If you [delete your account](https://docs.netbird.io/how-to/delete-account), the final charge for your usage will be processed during the next daily statistics update cycle at 2 AM UTC.
\ No newline at end of file
+If you [delete your account](/manage/settings/delete-account), the final charge for your usage will be processed during the next daily statistics update cycle at 2 AM UTC.
\ No newline at end of file
diff --git a/src/pages/manage/team/add-users-to-your-network.mdx b/src/pages/manage/team/add-users-to-your-network.mdx
index 50c70b05..a4d94c00 100644
--- a/src/pages/manage/team/add-users-to-your-network.mdx
+++ b/src/pages/manage/team/add-users-to-your-network.mdx
@@ -62,7 +62,7 @@ See the [Provision Users and Groups From Your Identity Provider](/manage/team/id
 ## Manage user roles
 NetBird has five user roles - `Owner`, `Admin`, `Network Admin`, `Auditor` and `User`. The roles allow you to control the level of access to the management API of your account. 
 
-- `Owner` role - has full access to the account and can manage all aspects of the account. There can be only one account owner in NetBird. Users with the owner role can delete their organization account. See the [Delete NetBird account](/how-to/delete-account) section for more.
+- `Owner` role - has full access to the account and can manage all aspects of the account. There can be only one account owner in NetBird. Users with the owner role can delete their organization account. See the [Delete NetBird account](/manage/settings/delete-account) section for more.
 - `Admin` role - has full access to the account except that administrators can't delete or update the role of the Owner user and delete the organization account.
 - `Network Admin` role - has access to manage network configurations, including access policies, DNS settings, networks, and network routes, but they can only view user and device information and general settings.
 - `Auditor` role - can read all configurations but not modify any of them.
diff --git a/src/pages/manage/team/idp-sync/okta-sync.mdx b/src/pages/manage/team/idp-sync/okta-sync.mdx
index 6ec4f5ee..0cfcc37c 100644
--- a/src/pages/manage/team/idp-sync/okta-sync.mdx
+++ b/src/pages/manage/team/idp-sync/okta-sync.mdx
@@ -157,7 +157,7 @@ If everything works as expected, you'll see the message: "NetBird was verified s
 
 On NetBird, click `Continue →`. You'll see instructions for configuring SCIM provisioning to NetBird.
 
-![NetBird Configure SCIM provisioning to NetBird](https://imgur.com/wBX2k3r.png)
+![NetBird Configure SCIM provisioning to NetBird](/docs-static/img/manage/team/idp-sync/okta-scim-provisioning.png)
 
 Back to Okta, click `Edit` as shown below.
 
diff --git a/src/pages/selfhosted/identity-providers.mdx b/src/pages/selfhosted/identity-providers.mdx
index 2d1e7096..5a291843 100644
--- a/src/pages/selfhosted/identity-providers.mdx
+++ b/src/pages/selfhosted/identity-providers.mdx
@@ -30,7 +30,7 @@ Create new zitadel project
 - Name: `NETBIRD`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-project.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-project.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 Create new zitadel application
@@ -41,14 +41,14 @@ Create new zitadel application
 - TYPE OF APPLICATION: `User Agent`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values and click `Continue`
 - Authentication Method: `PKCE`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values and click `Continue`
@@ -58,14 +58,14 @@ Create new zitadel application
 - Post Logout URIs: `https://<domain>/` and click `+`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-uri.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Verify applications details and Click `Create` and then click `Close`
 - Under `Grant Types` select `Authorization Code`, `Device Code` and `Refresh Token` and click `save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-new-application-overview.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Copy `Client ID` will be used later in the `setup.env`
@@ -83,7 +83,7 @@ To configure `netbird` application token you need to:
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-token-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 3: Application Redirect Configuration
@@ -102,7 +102,7 @@ To configure `netbird` application redirect you need to:
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-redirect-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 4: Create a Service User
@@ -120,7 +120,7 @@ In this step we will create a `netbird` service user.
 - Click `Create`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-create-user.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-create-user.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 In this step we will generate `ClientSecret` for the `netbird` service user.
@@ -129,7 +129,7 @@ In this step we will generate `ClientSecret` for the `netbird` service user.
 - Copy `ClientSecret` from the dialog will be used later to set `NETBIRD_IDP_MGMT_CLIENT_SECRET` in the `setup.env`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-user-secret.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 5: Grant manage-users role to netbird service user
@@ -143,7 +143,7 @@ In this step we will grant `Org User Manager` role to `netbird` service user.
 - Click `Add`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/zitadel-service-account-role.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 Your authority OIDC configuration will be available under:
@@ -205,7 +205,7 @@ to your network using the [Interactive SSO Login feature](/get-started/install#r
 over Keycloak.
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-auth-grant.gif" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 1: Check your Keycloak Instance
@@ -229,7 +229,7 @@ To create a realm you need to:
 - Click `Create`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-realm.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
@@ -246,7 +246,7 @@ In this step we will create a NetBird administrator user.
 - Click `Create`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-user.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-user.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 The user will need an initial password set to be able to log in. To do this:
@@ -257,7 +257,7 @@ The user will need an initial password set to be able to log in. To do this:
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-set-password.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-set-password.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 4: Create a NetBird client
@@ -274,14 +274,14 @@ In this step we will create NetBird application client and register with the Key
 - Your newly client `netbird-client` will be used later to set `NETBIRD_AUTH_CLIENT_ID` in the `setup.env`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
 - Check the checkboxes as on the screenshot below and click Save
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-enable-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 5: Adjust NetBird client access settings
@@ -301,7 +301,7 @@ In this step we will configure NetBird application client access with the NetBir
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-access-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 6: Create a NetBird client scope
@@ -319,7 +319,7 @@ In this step, we will create and configure the NetBird client audience for Keycl
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-client-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - While in the newly created Client Scope, switch to the `Mappers` tab
@@ -327,7 +327,7 @@ In this step, we will create and configure the NetBird client audience for Keycl
 - Choose the `Audience` mapping
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values:
@@ -337,7 +337,7 @@ In this step, we will create and configure the NetBird client audience for Keycl
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 7: Add client scope to NetBird client
@@ -353,7 +353,7 @@ In this step, we will create and configure the NetBird client audience for Keycl
 - The value `netbird-client` will be used as audience
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloack-add-client-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 8: Create a NetBird-Backend client
@@ -370,13 +370,13 @@ In this step we will create NetBird backend client and register with the Keycloa
 - Your newly client `netbird-backend` will be used later to set `NETBIRD_IDP_MGMT_CLIENT_ID` in the `setup.env`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-create-backend-client.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Check the checkboxes as on the screenshot below and click Save
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-auth.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 The client will need secret to authenticate. To do this:
@@ -384,7 +384,7 @@ The client will need secret to authenticate. To do this:
 - Copy `client secret` will be used later to set `NETBIRD_IDP_MGMT_CLIENT_SECRET` in the `setup.env`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-backend-client-credentials.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 9: Add view-users role to netbird-backend
@@ -398,13 +398,13 @@ The client will need secret to authenticate. To do this:
 - Select `Filter by clients` and search for `view-users`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-service-account-role.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Check the role checkbox and click assign
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/keycloak-add-role.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/keycloak-add-role.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -467,7 +467,7 @@ In this step, we will create OAuth2/OpenID Provider in Authentik.
     - type: `OAuth2/OpenID Provider`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-type.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values and click `Finish`
@@ -486,7 +486,7 @@ In this step, we will create OAuth2/OpenID Provider in Authentik.
 
 Take note of `Client ID`, we will use it later
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-provider-config.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 2: Create external applications
@@ -501,7 +501,7 @@ In this step, we will create external applications in Authentik.
     - Provider: `Netbird`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 3: Create service account
@@ -515,7 +515,7 @@ In this step, we will create service account.
     - Create Group: `Disable`
  
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-service-account.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Take note of the NetBird service account `username`, we will need it later.
@@ -525,7 +525,7 @@ Be sure to select the NetBird Service account object as the `User` when creating
 Take note of the app password as we will need it later.
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-service-account-details.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 4: Add service account to admin group
@@ -539,7 +539,7 @@ In this step, we will add `Netbird` service account to `authentik Admins` group.
 - Disable `Hide service-accounts` and verify if user `Netbird` is added to the group
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-add-user-group.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 5: Create a authentication flow for device token authentication
@@ -553,7 +553,7 @@ In this step, we will add `Netbird` service account to `authentik Admins` group.
     - Authentication: `Require authentication`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-device-flow.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-new-device-flow.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Navigate to authentik  admin interface
@@ -563,7 +563,7 @@ In this step, we will add `Netbird` service account to `authentik Admins` group.
 - Click `Update`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/authentik-brand-device-flow.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/authentik-brand-device-flow.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 Your authority OIDC configuration will be available under:
@@ -632,7 +632,7 @@ Create new PocketID OIDC Client
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-oidc-client.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-oidc-client.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Copy `Client ID` will be used later in the `setup.env`
@@ -650,7 +650,7 @@ To configure the application token you need to:
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/pocketid-create-api-token.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/pocketid-create-api-token.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Copy `API Key` will be used later in the `setup.env`
@@ -724,7 +724,7 @@ In this step, we will create and configure NetBird application in azure AD.
     - Redirect URI: select `Single-page application (SPA)` and URI as `https://<yournetbirddomain.com>/silent-auth`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-new-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 2. Platform configurations
@@ -732,20 +732,20 @@ In this step, we will create and configure NetBird application in azure AD.
 - Under the `Single-page application` Section, add another URI `https://<yournetbirddomain.com>/auth`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-spa-uri-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Scroll down and setup other options as on the screenshot below and click Save
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-flows-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-flows-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Click `Add a Platform` and select `Mobile and desktop applications`
 - Fill in the form with the following values and click Configure
     - Custom redirect URIs:  `http://localhost:53000`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-spa-uri-setup.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 3. Create a NetBird application scope
@@ -756,7 +756,7 @@ In this step, we will create and configure NetBird application in azure AD.
 - Scope name: `api`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-add-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Under `Authorized client Applications`, click on `+ add a client application` and enter the following:
@@ -764,7 +764,7 @@ In this step, we will create and configure NetBird application in azure AD.
 - Client ID: same as your Application ID URI minus the `api://`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-add-application-scope.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
@@ -776,7 +776,7 @@ Add `Netbird` permissions
 - Click `My APIs` tab, and select `Netbird`. Next check `api` permission checkbox and click `Add permissions`.
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-netbird-api-permisssions.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 Add `Delegated permissions` to Microsoft Graph
@@ -786,14 +786,14 @@ Add `Delegated permissions` to Microsoft Graph
 - In `Select permissions` search for `User.Read` and under the `User` section select `User.Read.All` and click  `Add permissions`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-openid-permissions.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
 - Click `Grant admin consent for Default Directory` and click `Yes`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-grant-admin-conset.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 5. Update token version
@@ -809,7 +809,7 @@ Add `Delegated permissions` to Microsoft Graph
 - Copy `Value` and save it as it can be viewed only once after creation.
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/azure-client-secret.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/azure-client-secret.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Click `Overview` on left menu and take note of `Application (client) ID`, `Object ID` and `Directory (tenant) ID`
@@ -870,7 +870,7 @@ In this step, we will create and configure Netbird single-page application in ok
   - Application type: `Single-Page Application`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-new-single-page-application.png" alt="high-level-dia" className="imagewrapper"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-single-page-application.png" alt="high-level-dia" className="imagewrapper"/>
 </p>
 
 - Fill in the form with the following values and click `Save`
@@ -881,7 +881,7 @@ In this step, we will create and configure Netbird single-page application in ok
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-single-page-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-page-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Navigate to Okta Admin Dashboard
@@ -892,7 +892,7 @@ In this step, we will create and configure Netbird single-page application in ok
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-single-sign-on-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-single-sign-on-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 2. Create and configure Okta native application
@@ -905,7 +905,7 @@ In this step, we will create and configure Netbird native application in okta.
   - Application type: `Native Application`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-new-native-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-new-native-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values and click `Save`
@@ -914,7 +914,7 @@ In this step, we will create and configure Netbird native application in okta.
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-native-application.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-application.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Navigate to Okta Admin Dashboard
@@ -925,7 +925,7 @@ In this step, we will create and configure Netbird native application in okta.
 - Click `Save`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-native-sign-on-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-native-sign-on-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
@@ -941,7 +941,7 @@ In this step, we will generate netbird api token in okta for authorizing calls t
 - Take note of token value and click `OK, got it`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/okta-generate-token.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/okta-generate-token.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 
@@ -998,7 +998,7 @@ Before you start creating and configuring an Google Workspace application, ensur
 - Navigate to [OAuth consent](https://console.cloud.google.com/apis/credentials/consent) page
 - Select `Internal` User Type and click create
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-type.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-type.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill in the form with the following values and click `SAVE AND CONTINUE`
@@ -1009,12 +1009,12 @@ Before you start creating and configuring an Google Workspace application, ensur
 - Click `ADD OR REMOVE SCOPES`
 - Select `/auth/userinfo.email`, `/auth/userinfo.profile` and `openid` scopes and then click `UPDATE`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-scopes.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-scopes.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Click `SAVE AND CONTINUE`
 - Verify the summary of the OAuth consent screen to ensure that everything is properly configured, and then click `BACK TO DASHBOARD`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-consent-screen-summary.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-consent-screen-summary.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 2: Create OAuth 2.0 credentials
@@ -1026,11 +1026,11 @@ Before you start creating and configuring an Google Workspace application, ensur
     - Authorized JavaScript origins: `https://<your netbird domain>` and `http://localhost`
     - Authorized redirect URIs: `https://<your netbird domain>/auth`, `https://<your netbird domain>/silent-auth` and `http://localhost:53000`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Take note of `Client ID` and `Client Secret` and click `OK`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-oauth-client-created.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-oauth-client-created.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 3: Create service account
@@ -1042,14 +1042,14 @@ Before you start creating and configuring an Google Workspace application, ensur
 - Take note of service account email address, we will use it later
 - Click `DONE`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-create.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-create.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 4: Create service account keys
 - Navigate to [API Credentials](https://console.cloud.google.com/apis/credentials) page
 - Under  `Service Accounts` click the `netbird` to edit the service account
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-edit-service-account.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-edit-service-account.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Click the `Keys` tab
 - Click the `Add key` drop-down menu, then select `Create new key`
@@ -1071,23 +1071,23 @@ Read how to manage and secure your service keys [here](https://cloud.google.com/
     - description: `User Management ReadOnly`
 - Click `CONTINUE`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-new-role-info.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-new-role-info.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Scroll down to `Admin API privileges` and add the following privileges
     - Users: `Read`
 - Click `CONTINUE`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-privileges-review.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-privileges-review.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Verify preview of assigned Admin API privileges to ensure that everything is properly configured, and then click `CREATE ROLE`
 - Click `Assign service accounts`, add service account email address and then click `ADD`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-assign-role.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-assign-role.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Click `ASSIGN ROLE` to assign service account to `User Management ReadOnly` role
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/google-service-account-privileges.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/google-service-account-privileges.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Navigate to [Account Settings](https://admin.google.com/ac/accountsettings/profile?hl=en_US) page and take note of `Customer ID`
@@ -1194,14 +1194,14 @@ You can enable it by following these steps:
 - Click `Create`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-interactive-login-app.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Click `Settings` tab
 - Copy **`Client ID`** to `NETBIRD_AUTH_DEVICE_AUTH_CLIENT_ID` in the `setup.env` file
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-interactive-login-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Scroll down to the `Advanced Settings` section
@@ -1209,7 +1209,7 @@ You can enable it by following these steps:
 - Click `Save Changes`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-grant-types.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-grant-types.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 #### Step 5: Create and configuire Machine to Machine application.
@@ -1224,7 +1224,7 @@ This application will be used to authorize access to Auth0 Management API.
 - Click `Create`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-machine-app.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-create-machine-app.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Fill the form with the following values:
@@ -1233,7 +1233,7 @@ This application will be used to authorize access to Auth0 Management API.
   - Click `Authorize`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-authorization.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-authorization.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 <Note>
@@ -1249,7 +1249,7 @@ To enable this functionality, include the `--user-delete-from-idp` flag in the m
 - Copy **`DOMAIN`** to `NETBIRD_IDP_MGMT_EXTRA_AUDIENCE` in the `setup.env` file
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/auth0-machine-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/auth0-machine-settings.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Set properties in the `setup.env` file:
@@ -1287,23 +1287,23 @@ Before you start creating and configuring an JumpCloud application, ensure that
 - Click `SSO Applications` on the left menu under `USER AUTHENTICATION` section
 - Click `Add New Application` and select `Custom Application`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - On the `Which application would you like to integrate` screen, confirm that you've selected `Custom application` and click `Next`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirm-selection.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - On the `Select the features you would like to enable` screen, select `Manage Single Sign-On (SSO)` and check `Configure SSO with OIDC` and click `Next`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-features.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - On the `Enter General info` screen, add `NetBird` as `Display Label` and click `Next`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-general-info.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - On the confirmation screen, review the information and click on `Configure Application` to proceed
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-new-sso-app-confirmation.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - On the `New Application` screen, click on the SSO tab and enter the following values:
     - Under `Endpoint Configuration` section:
@@ -1312,20 +1312,20 @@ Before you start creating and configuring an JumpCloud application, ensure that
       - Login URL: `https://<domain>`
 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
     - Under `Attribute Mapping (optional)` section:
         - Standard Scopes: `Email`, `Profile`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-sso-atributes-configuration.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Click on the `User Groups` tab and select the user groups that can access this application
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-user-groups.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-user-groups.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Click `Activate`
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-oidc-app.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-oidc-app.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - Take note of `Client ID`, will be used later
 
@@ -1349,7 +1349,7 @@ The following steps will assume that you are creating a new account. If you alre
     please ensure that you assign the `Help Desk` role to the `NetBird Integration` user following the steps outlined above.
 </Note>
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-add-admin-user.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-add-admin-user.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 After following the steps above, you will receive the login instructions for the newly created user in the email configured. Please follow the instructions to set a password for the user.
@@ -1361,12 +1361,12 @@ In this step, we will generate netbird api token in jumpcloud for authorizing ca
 - Login with the user created in the previous step or with an existing user
 - Click on the account initials displayed at the top-right and select `My API Key` from the drop-down
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-profile.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-profile.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 - If there is no API key generated, click on `Generate New API Key` button
 - Take note of your api token displayed 
 <p>
-    <img src="/docs-static/img/integrations/identity-providers/self-hosted/jumpcloud-api-key-generation.png" alt="high-level-dia" className="imagewrapper-big"/>
+    <img src="/docs-static/img/selfhosted/identity-providers/self-hosted/jumpcloud-api-key-generation.png" alt="high-level-dia" className="imagewrapper-big"/>
 </p>
 
 - Set properties in the `setup.env` file:
diff --git a/src/pages/selfhosted/self-hosted-vs-cloud-netbird.mdx b/src/pages/selfhosted/self-hosted-vs-cloud-netbird.mdx
index c3af9c37..4b733081 100644
--- a/src/pages/selfhosted/self-hosted-vs-cloud-netbird.mdx
+++ b/src/pages/selfhosted/self-hosted-vs-cloud-netbird.mdx
@@ -40,7 +40,7 @@ some additional features that are targeted at business customers and help with n
 - **[Integrations with EDR](/manage/access-control/endpoint-detection-and-response)** like CrowdStrike and others.
 - **[Peer approval](/manage/peers/approve-peers)** to join the network.
 - **[User invites](/manage/team/add-users-to-your-network#direct-user-invites)**.
-- **[MSP functionality](/how-to/msp-portal)** for managing multiple tenant networks from a single account.
+- **[MSP functionality](/manage/for-partners/msp-portal)** for managing multiple tenant networks from a single account.
 
 ## Geo Distributed Relay Servers
 
diff --git a/src/pages/selfhosted/troubleshooting.mdx b/src/pages/selfhosted/troubleshooting.mdx
index 70fcf278..1cf5669e 100644
--- a/src/pages/selfhosted/troubleshooting.mdx
+++ b/src/pages/selfhosted/troubleshooting.mdx
@@ -12,12 +12,12 @@ configuration as follows:
 Please replace <b>netbird.DOMAIN.com</b> and <b>PASSWORD</b> with the information from the <b>management.json</b> TURNConfig, then click on <b>Add server</b>.
 
 <p>
-    <img src="/docs-static/img/troubleshooting/turn.png" alt="turn" width="700" className="imagewrapper"/>
+    <img src="/docs-static/img/selfhosted/troubleshooting/turn.png" alt="turn" width="700" className="imagewrapper"/>
 </p>
 
 You should see an output similar to the following:
 <p>
-    <img src="/docs-static/img/troubleshooting/turn-test-out.png" alt="turn" width="700" className="imagewrapper-nig"/>
+    <img src="/docs-static/img/selfhosted/troubleshooting/turn-test-out.png" alt="turn" width="700" className="imagewrapper-nig"/>
 </p>
 Where you have the following types: `host` (local address), `srflx` (STUN reflexive address), `relay`
 (TURN relay address). If `srflx` and `relay` are not present then the TURN server is not working or not accessible and you should review the required ports in the [requirements section](/selfhosted/selfhosted-guide#requirements).
diff --git a/src/pages/use-cases/distributed-multi-cloud-ai-argocd-microk8s-vllm.mdx b/src/pages/use-cases/distributed-multi-cloud-ai-argocd-microk8s-vllm.mdx
index 68e673e2..111dd1aa 100644
--- a/src/pages/use-cases/distributed-multi-cloud-ai-argocd-microk8s-vllm.mdx
+++ b/src/pages/use-cases/distributed-multi-cloud-ai-argocd-microk8s-vllm.mdx
@@ -69,7 +69,7 @@ Install [**cert-manager**](https://cert-manager.io/docs/installation/#default-s
 kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.0/cert-manager.yaml
 ```
 
-Add NetBird API token. You can create a PAT by following the steps [**here**](https://docs.netbird.io/how-to/access-netbird-public-api#creating-a-service-user)
+Add NetBird API token. You can create a PAT by following the steps [**here**](/manage/public-api#creating-a-service-user)
 
 ```jsx
 kubectl create namespace netbirdkubectl -n netbird create secret generic netbird-mgmt-api-key --from-literal=NB_API_KEY=$(cat ~/nb-pat.secret)
@@ -107,7 +107,7 @@ ingres:
     enabled: true
 ```
 
-To learn more please checkout the official docs on our [K8s Operator](https://docs.netbird.io/how-to/kubernetes-operator#using-helm).
+To learn more please checkout the official docs on our [K8s Operator](/manage/integrations/kubernetes#using-helm).
 
 ### Install ArgoCD
 
@@ -143,7 +143,7 @@ Next we will enable sidecars. **Why Sidecars?** The application controller need
 
 To enable sidecar functionality in your deployments, you first need to generate a setup key, either via the UI (enable the **Ephemeral Peers** options) or by following [**this guide**](https://docs.netbird.io/manage/peers/register-machines-using-setup-keys) for more details on setup keys. We will inject side-cars to ArgoCD application controller so it can communicate with remote MicroK8s clusters. 
 
-Note: We recommend checking out the section of our [Kubernetes Operator docs on using sidecars](https://docs.netbird.io/how-to/kubernetes-operator#accessing-remote-services-using-sidecars) for more context and detail.
+Note: We recommend checking out the section of our [Kubernetes Operator docs on using sidecars](/manage/integrations/kubernetes#accessing-remote-services-using-sidecars) for more context and detail.
 
 Next, you'll create a secret in Kubernetes and add a new resource called `NBSetupKey`. The `NBSetupKey` name can then be referenced in your deployments or daemon sets to specify which setup key should be used when injecting a sidecar into your application pods. Below is an example of a secret and an `NBSetupKey` resource:
 
@@ -689,8 +689,8 @@ curl https://mega-mesh.net/v1/completions \
 
 ### NetBird Resources
 
-- **Kubernetes Operator Deployment**: [https://docs.netbird.io/how-to/kubernetes-operator#deployment](https://docs.netbird.io/how-to/kubernetes-operator#deployment)
-- **Service Mesh Sidecars**: [https://docs.netbird.io/how-to/kubernetes-operator#accessing-remote-services-using-sidecars](https://docs.netbird.io/how-to/kubernetes-operator#accessing-remote-services-using-sidecars)
+- **Kubernetes Operator Deployment**: [/manage/integrations/kubernetes#deployment](/manage/integrations/kubernetes#deployment)
+- **Service Mesh Sidecars**: [/manage/integrations/kubernetes#accessing-remote-services-using-sidecars](/manage/integrations/kubernetes#accessing-remote-services-using-sidecars)
 
 ### ArgoCD Resources
 
diff --git a/src/pages/use-cases/setup-site-to-site-access.mdx b/src/pages/use-cases/setup-site-to-site-access.mdx
index 4b1bb1b3..8507e029 100644
--- a/src/pages/use-cases/setup-site-to-site-access.mdx
+++ b/src/pages/use-cases/setup-site-to-site-access.mdx
@@ -178,7 +178,7 @@ and an **Access Control Policy** that establishes connectivity between the (futu
 </p>
 
 <Note>
-  It doesn't matter that this is a unidirectional ICMP rule in the wrong direction - **Network Routes** are activated as soon as any **Access Control Policy** establishes connectivity to the **Routing Peer**, as explained in [Network Routes caveats](/how-to/routing-traffic-to-private-networks#network-routes-caveats).
+  It doesn't matter that this is a unidirectional ICMP rule in the wrong direction - **Network Routes** are activated as soon as any **Access Control Policy** establishes connectivity to the **Routing Peer**, as explained in [Network Routes caveats](/manage/network-routes/routing-traffic-to-private-networks#network-routes-caveats).
 </Note>
 
 We can verify that the local **Peer** can reach the `remote-site` using both `ping` and `curl`: