diff --git a/docs/documentation/platform/mfa.mdx b/docs/documentation/platform/mfa.mdx
index 3ca9c5dff..69a84fdd4 100644
--- a/docs/documentation/platform/mfa.mdx
+++ b/docs/documentation/platform/mfa.mdx
@@ -17,3 +17,40 @@ Check the box in Personal Settings > Two-factor Authentication to enable email-b
   building support for other forms of identification via SMS and Authenticator
   App.
 </Note>
+
+## Entra ID / Azure AD MFA
+
+<Note>
+    Before proceeding make sure you've enabled [SAML SSO for Entra ID / Azure AD](./sso/azure).
+
+    We also encourage you to have your team download and setup the
+    [Microsoft Authenticator App](https://www.microsoft.com/en-us/security/mobile-authenticator-app) prior to enabling MFA.
+</Note>
+
+<Steps>
+    <Step title="Open your Infisical Application in the Microsoft Entra Admin Center">
+        ![Entra Infisical app](../../images/platform/mfa/entra/mfa_entra_infisical_app.png)
+    </Step>
+    <Step title="Tap on Conditional Access under the Security Tab">
+        ![conditional access](../../images/platform/mfa/entra/mfa_entra_conditional_access.png)
+    </Step>
+    <Step title="Tap on Create New Policy from Templates">
+        ![create policy](../../images/platform/mfa/entra/mfa_entra_create_policy.png)
+    </Step>
+    <Step title="Select Require MFA for All Users and Tap on Review + Create">
+        ![require MFA and review policy](../../images/platform/mfa/entra/mfa_entra_review_policy.png)
+        <Note>
+            By default all users except the configuring admin will be setup to require MFA.
+            Microsoft encourages keeping at least one admin excluded from MFA to prevent accidental lockout.
+        </Note>
+    </Step>
+    <Step title="Set Policy State to Enabled and Tap on Create">
+        ![enable policy and confirm](../../images/platform/mfa/entra/mfa_entra_confirm_policy.png)
+    </Step>
+    <Step title="MFA is now Required When Accessing Infisical">
+        ![mfa login](../../images/platform/mfa/entra/mfa_entra_login.png)
+        <Note>
+            If users have not setup MFA for Entra / Azure they will be prompted to do so at this time.
+        </Note>
+    </Step>
+</Steps>
\ No newline at end of file
diff --git a/docs/documentation/platform/sso/azure.mdx b/docs/documentation/platform/sso/azure.mdx
index b1145bcaf..e69d3169a 100644
--- a/docs/documentation/platform/sso/azure.mdx
+++ b/docs/documentation/platform/sso/azure.mdx
@@ -116,3 +116,7 @@ description: "Learn how to configure Microsoft Entra ID for Infisical SSO."
    - `AUTH_SECRET`: A secret key used for signing and verifying JWT. This can be a random 32-byte base64 string generated with `openssl rand -base64 32`.
    - `SITE_URL`: The URL of your self-hosted instance of Infisical - should be an absolute URL including the protocol (e.g. https://app.infisical.com)
 </Note>
+
+<Note>
+   If you'd like to require Multi-factor Authentication for your team members to access Infisical check out our [Entra ID / Azure AD MFA](../mfa#entra-id-azure-ad-mfa) guide.
+</Note>
diff --git a/docs/images/platform/mfa/entra/mfa_entra_conditional_access.png b/docs/images/platform/mfa/entra/mfa_entra_conditional_access.png
new file mode 100644
index 000000000..a1ac6732f
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_conditional_access.png differ
diff --git a/docs/images/platform/mfa/entra/mfa_entra_confirm_policy.png b/docs/images/platform/mfa/entra/mfa_entra_confirm_policy.png
new file mode 100644
index 000000000..7f5432f00
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_confirm_policy.png differ
diff --git a/docs/images/platform/mfa/entra/mfa_entra_create_policy.png b/docs/images/platform/mfa/entra/mfa_entra_create_policy.png
new file mode 100644
index 000000000..54a64b4e3
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_create_policy.png differ
diff --git a/docs/images/platform/mfa/entra/mfa_entra_infisical_app.png b/docs/images/platform/mfa/entra/mfa_entra_infisical_app.png
new file mode 100644
index 000000000..e9fb4f625
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_infisical_app.png differ
diff --git a/docs/images/platform/mfa/entra/mfa_entra_login.png b/docs/images/platform/mfa/entra/mfa_entra_login.png
new file mode 100644
index 000000000..a5dd09330
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_login.png differ
diff --git a/docs/images/platform/mfa/entra/mfa_entra_review_policy.png b/docs/images/platform/mfa/entra/mfa_entra_review_policy.png
new file mode 100644
index 000000000..c53feb0fb
Binary files /dev/null and b/docs/images/platform/mfa/entra/mfa_entra_review_policy.png differ
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx
index 6257ffa6f..7686d7b4f 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx
@@ -30,7 +30,7 @@ enum AuthProvider {
 
 const ssoAuthProviders = [
   { label: "Okta SAML", value: AuthProvider.OKTA_SAML },
-  { label: "Azure SAML", value: AuthProvider.AZURE_SAML },
+  { label: "Azure / Entra SAML", value: AuthProvider.AZURE_SAML },
   { label: "JumpCloud SAML", value: AuthProvider.JUMPCLOUD_SAML },
   { label: "Keycloak SAML", value: AuthProvider.KEYCLOAK_SAML },
   { label: "Google SAML", value: AuthProvider.GOOGLE_SAML }
@@ -161,7 +161,7 @@ export const SSOModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDelet
           entityId: "Identifier (Entity ID)",
           entryPoint: "Login URL",
           entryPointPlaceholder: "https://login.microsoftonline.com/xxx/saml2",
-          issuer: "Azure Application ID",
+          issuer: "Azure / Entra Application ID",
           issuerPlaceholder: "abc-def-ghi-jkl-mno"
         };
       case AuthProvider.JUMPCLOUD_SAML: