diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts
index e552ef617..9ec77de16 100644
--- a/web/src/elements/buttons/ModalButton.ts
+++ b/web/src/elements/buttons/ModalButton.ts
@@ -9,6 +9,7 @@ import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css";
 import PFCard from "@patternfly/patternfly/components/Card/card.css";
+import PFTitle from "@patternfly/patternfly/components/Title/title.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
 import AKGlobal from "../../authentik.css";
 import { PFSize } from "../Spinner";
@@ -39,7 +40,7 @@ export class ModalButton extends LitElement {
     open = false;
 
     static get styles(): CSSResult[] {
-        return [PFBase, PFButton, PFModalBox, PFForm, PFFormControl, PFBullseye, PFBackdrop, PFPage, PFStack, PFCard, PFContent, AKGlobal, MODAL_BUTTON_STYLES];
+        return [PFBase, PFButton, PFModalBox, PFForm, PFTitle, PFFormControl, PFBullseye, PFBackdrop, PFPage, PFStack, PFCard, PFContent, AKGlobal, MODAL_BUTTON_STYLES];
     }
 
     constructor() {
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 9e7a1681d..933cfe005 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -526,7 +526,7 @@ msgstr "Clear cache"
 msgid "Click to change value"
 msgstr "Click to change value"
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:42
+#: src/pages/outposts/OutpostDeploymentModal.ts:33
 msgid "Click to copy token"
 msgstr "Click to copy token"
 
@@ -550,7 +550,7 @@ msgstr "Client Secret"
 msgid "Client type"
 msgstr "Client type"
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:56
+#: src/pages/outposts/OutpostDeploymentModal.ts:48
 msgid "Close"
 msgstr "Close"
 
@@ -704,8 +704,8 @@ msgstr "Copy Key"
 #: src/pages/flows/FlowListPage.ts:117
 #: src/pages/groups/GroupListPage.ts:91
 #: src/pages/groups/GroupListPage.ts:99
-#: src/pages/outposts/OutpostListPage.ts:102
-#: src/pages/outposts/OutpostListPage.ts:110
+#: src/pages/outposts/OutpostListPage.ts:101
+#: src/pages/outposts/OutpostListPage.ts:109
 #: src/pages/outposts/ServiceConnectionListPage.ts:110
 #: src/pages/outposts/ServiceConnectionListPage.ts:119
 #: src/pages/policies/BoundPoliciesList.ts:158
@@ -776,7 +776,7 @@ msgstr "Create Notification Rule"
 msgid "Create Notification Transport"
 msgstr "Create Notification Transport"
 
-#: src/pages/outposts/OutpostListPage.ts:105
+#: src/pages/outposts/OutpostListPage.ts:104
 msgid "Create Outpost"
 msgstr "Create Outpost"
 
@@ -867,7 +867,7 @@ msgstr "Define how notifications are sent to users, like Email or Webhook."
 #: src/pages/events/TransportListPage.ts:86
 #: src/pages/flows/FlowListPage.ts:86
 #: src/pages/groups/GroupListPage.ts:82
-#: src/pages/outposts/OutpostListPage.ts:86
+#: src/pages/outposts/OutpostListPage.ts:87
 #: src/pages/outposts/ServiceConnectionListPage.ts:101
 #: src/pages/policies/PolicyListPage.ts:115
 #: src/pages/property-mappings/PropertyMappingListPage.ts:104
@@ -1015,7 +1015,7 @@ msgstr "Each provider has a different issuer, based on the application slug."
 #: src/pages/events/TransportListPage.ts:74
 #: src/pages/flows/FlowListPage.ts:74
 #: src/pages/groups/GroupListPage.ts:70
-#: src/pages/outposts/OutpostListPage.ts:74
+#: src/pages/outposts/OutpostListPage.ts:75
 #: src/pages/outposts/ServiceConnectionListPage.ts:89
 #: src/pages/policies/PolicyListPage.ts:90
 #: src/pages/property-mappings/PropertyMappingListPage.ts:79
@@ -1452,7 +1452,7 @@ msgstr "HTTP-Basic Password Key"
 msgid "HTTP-Basic Username Key"
 msgstr "HTTP-Basic Username Key"
 
-#: src/pages/outposts/OutpostListPage.ts:51
+#: src/pages/outposts/OutpostListPage.ts:52
 msgid "Health and Version"
 msgstr "Health and Version"
 
@@ -1516,7 +1516,7 @@ msgstr "If left empty, authentik will try to extract the launch URL based on the
 msgid "If this flag is set, this Stage will jump to the next Stage when no Invitation is given. By default this Stage will cancel the Flow when no invitation is given."
 msgstr "If this flag is set, this Stage will jump to the next Stage when no Invitation is given. By default this Stage will cancel the Flow when no invitation is given."
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:46
+#: src/pages/outposts/OutpostDeploymentModal.ts:37
 msgid "If your authentik Instance is using a self-signed certificate, set this value."
 msgstr "If your authentik Instance is using a self-signed certificate, set this value."
 
@@ -1849,7 +1849,7 @@ msgstr "Monitor"
 #: src/pages/groups/GroupListPage.ts:45
 #: src/pages/groups/MemberSelectModal.ts:44
 #: src/pages/outposts/OutpostForm.ts:47
-#: src/pages/outposts/OutpostListPage.ts:49
+#: src/pages/outposts/OutpostListPage.ts:50
 #: src/pages/outposts/ServiceConnectionDockerForm.ts:53
 #: src/pages/outposts/ServiceConnectionKubernetesForm.ts:54
 #: src/pages/outposts/ServiceConnectionListPage.ts:53
@@ -2149,11 +2149,11 @@ msgstr "Optionally set the 'FriendlyName' value of the Assertion attribute."
 msgid "Order"
 msgstr "Order"
 
-#: src/pages/outposts/OutpostListPage.ts:79
+#: src/pages/outposts/OutpostListPage.ts:80
 msgid "Outpost"
 msgstr "Outpost"
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:25
+#: src/pages/outposts/OutpostDeploymentModal.ts:16
 msgid "Outpost Deployment Info"
 msgstr "Outpost Deployment Info"
 
@@ -2166,11 +2166,11 @@ msgid "Outpost Service-connection"
 msgstr "Outpost Service-connection"
 
 #: src/interfaces/AdminInterface.ts:20
-#: src/pages/outposts/OutpostListPage.ts:28
+#: src/pages/outposts/OutpostListPage.ts:29
 msgid "Outposts"
 msgstr "Outposts"
 
-#: src/pages/outposts/OutpostListPage.ts:31
+#: src/pages/outposts/OutpostListPage.ts:32
 msgid "Outposts are deployments of authentik components to support different environments and protocols, like reverse proxies."
 msgstr "Outposts are deployments of authentik components to support different environments and protocols, like reverse proxies."
 
@@ -2391,7 +2391,7 @@ msgstr "Provider type"
 #: src/interfaces/AdminInterface.ts:20
 #: src/pages/admin-overview/AdminOverviewPage.ts:45
 #: src/pages/outposts/OutpostForm.ts:82
-#: src/pages/outposts/OutpostListPage.ts:50
+#: src/pages/outposts/OutpostListPage.ts:51
 msgid "Providers"
 msgstr "Providers"
 
@@ -3448,7 +3448,7 @@ msgstr "Up-to-date!"
 #: src/pages/flows/BoundStagesList.ts:71
 #: src/pages/flows/FlowListPage.ts:66
 #: src/pages/groups/GroupListPage.ts:62
-#: src/pages/outposts/OutpostListPage.ts:66
+#: src/pages/outposts/OutpostListPage.ts:67
 #: src/pages/outposts/ServiceConnectionListPage.ts:76
 #: src/pages/policies/BoundPoliciesList.ts:64
 #: src/pages/policies/BoundPoliciesList.ts:84
@@ -3519,7 +3519,7 @@ msgstr "Update OAuth Source"
 msgid "Update OAuth2 Provider"
 msgstr "Update OAuth2 Provider"
 
-#: src/pages/outposts/OutpostListPage.ts:69
+#: src/pages/outposts/OutpostListPage.ts:70
 msgid "Update Outpost"
 msgstr "Update Outpost"
 
@@ -3719,11 +3719,11 @@ msgstr "Version"
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#: src/pages/outposts/OutpostListPage.ts:91
+#: src/pages/outposts/OutpostListPage.ts:92
 msgid "View Deployment Info"
 msgstr "View Deployment Info"
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:28
+#: src/pages/outposts/OutpostDeploymentModal.ts:19
 msgid "View deployment documentation"
 msgstr "View deployment documentation"
 
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index f2882400d..17d70a677 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -520,7 +520,7 @@ msgstr ""
 msgid "Click to change value"
 msgstr ""
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:42
+#: src/pages/outposts/OutpostDeploymentModal.ts:33
 msgid "Click to copy token"
 msgstr ""
 
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Client type"
 msgstr ""
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:56
+#: src/pages/outposts/OutpostDeploymentModal.ts:48
 msgid "Close"
 msgstr ""
 
@@ -698,8 +698,8 @@ msgstr ""
 #: src/pages/flows/FlowListPage.ts:117
 #: src/pages/groups/GroupListPage.ts:91
 #: src/pages/groups/GroupListPage.ts:99
-#: src/pages/outposts/OutpostListPage.ts:102
-#: src/pages/outposts/OutpostListPage.ts:110
+#: src/pages/outposts/OutpostListPage.ts:101
+#: src/pages/outposts/OutpostListPage.ts:109
 #: src/pages/outposts/ServiceConnectionListPage.ts:110
 #: src/pages/outposts/ServiceConnectionListPage.ts:119
 #: src/pages/policies/BoundPoliciesList.ts:158
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Create Notification Transport"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:105
+#: src/pages/outposts/OutpostListPage.ts:104
 msgid "Create Outpost"
 msgstr ""
 
@@ -861,7 +861,7 @@ msgstr ""
 #: src/pages/events/TransportListPage.ts:86
 #: src/pages/flows/FlowListPage.ts:86
 #: src/pages/groups/GroupListPage.ts:82
-#: src/pages/outposts/OutpostListPage.ts:86
+#: src/pages/outposts/OutpostListPage.ts:87
 #: src/pages/outposts/ServiceConnectionListPage.ts:101
 #: src/pages/policies/PolicyListPage.ts:115
 #: src/pages/property-mappings/PropertyMappingListPage.ts:104
@@ -1007,7 +1007,7 @@ msgstr ""
 #: src/pages/events/TransportListPage.ts:74
 #: src/pages/flows/FlowListPage.ts:74
 #: src/pages/groups/GroupListPage.ts:70
-#: src/pages/outposts/OutpostListPage.ts:74
+#: src/pages/outposts/OutpostListPage.ts:75
 #: src/pages/outposts/ServiceConnectionListPage.ts:89
 #: src/pages/policies/PolicyListPage.ts:90
 #: src/pages/property-mappings/PropertyMappingListPage.ts:79
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "HTTP-Basic Username Key"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:51
+#: src/pages/outposts/OutpostListPage.ts:52
 msgid "Health and Version"
 msgstr ""
 
@@ -1508,7 +1508,7 @@ msgstr ""
 msgid "If this flag is set, this Stage will jump to the next Stage when no Invitation is given. By default this Stage will cancel the Flow when no invitation is given."
 msgstr ""
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:46
+#: src/pages/outposts/OutpostDeploymentModal.ts:37
 msgid "If your authentik Instance is using a self-signed certificate, set this value."
 msgstr ""
 
@@ -1841,7 +1841,7 @@ msgstr ""
 #: src/pages/groups/GroupListPage.ts:45
 #: src/pages/groups/MemberSelectModal.ts:44
 #: src/pages/outposts/OutpostForm.ts:47
-#: src/pages/outposts/OutpostListPage.ts:49
+#: src/pages/outposts/OutpostListPage.ts:50
 #: src/pages/outposts/ServiceConnectionDockerForm.ts:53
 #: src/pages/outposts/ServiceConnectionKubernetesForm.ts:54
 #: src/pages/outposts/ServiceConnectionListPage.ts:53
@@ -2141,11 +2141,11 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:79
+#: src/pages/outposts/OutpostListPage.ts:80
 msgid "Outpost"
 msgstr ""
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:25
+#: src/pages/outposts/OutpostDeploymentModal.ts:16
 msgid "Outpost Deployment Info"
 msgstr ""
 
@@ -2158,11 +2158,11 @@ msgid "Outpost Service-connection"
 msgstr ""
 
 #: src/interfaces/AdminInterface.ts:20
-#: src/pages/outposts/OutpostListPage.ts:28
+#: src/pages/outposts/OutpostListPage.ts:29
 msgid "Outposts"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:31
+#: src/pages/outposts/OutpostListPage.ts:32
 msgid "Outposts are deployments of authentik components to support different environments and protocols, like reverse proxies."
 msgstr ""
 
@@ -2383,7 +2383,7 @@ msgstr ""
 #: src/interfaces/AdminInterface.ts:20
 #: src/pages/admin-overview/AdminOverviewPage.ts:45
 #: src/pages/outposts/OutpostForm.ts:82
-#: src/pages/outposts/OutpostListPage.ts:50
+#: src/pages/outposts/OutpostListPage.ts:51
 msgid "Providers"
 msgstr ""
 
@@ -3438,7 +3438,7 @@ msgstr ""
 #: src/pages/flows/BoundStagesList.ts:71
 #: src/pages/flows/FlowListPage.ts:66
 #: src/pages/groups/GroupListPage.ts:62
-#: src/pages/outposts/OutpostListPage.ts:66
+#: src/pages/outposts/OutpostListPage.ts:67
 #: src/pages/outposts/ServiceConnectionListPage.ts:76
 #: src/pages/policies/BoundPoliciesList.ts:64
 #: src/pages/policies/BoundPoliciesList.ts:84
@@ -3509,7 +3509,7 @@ msgstr ""
 msgid "Update OAuth2 Provider"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:69
+#: src/pages/outposts/OutpostListPage.ts:70
 msgid "Update Outpost"
 msgstr ""
 
@@ -3709,11 +3709,11 @@ msgstr ""
 msgid "Version: {0}"
 msgstr ""
 
-#: src/pages/outposts/OutpostListPage.ts:91
+#: src/pages/outposts/OutpostListPage.ts:92
 msgid "View Deployment Info"
 msgstr ""
 
-#: src/pages/outposts/OutpostDeploymentModal.ts:28
+#: src/pages/outposts/OutpostDeploymentModal.ts:19
 msgid "View deployment documentation"
 msgstr ""
 
diff --git a/web/src/pages/outposts/OutpostDeploymentModal.ts b/web/src/pages/outposts/OutpostDeploymentModal.ts
index 7dcadab09..85ac2267e 100644
--- a/web/src/pages/outposts/OutpostDeploymentModal.ts
+++ b/web/src/pages/outposts/OutpostDeploymentModal.ts
@@ -1,27 +1,17 @@
 import { Outpost } from "authentik-api";
-import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { customElement, html, property, TemplateResult } from "lit-element";
 import { t } from "@lingui/macro";
-import PFTitle from "@patternfly/patternfly/components/Title/title.css";
-import PFBase from "@patternfly/patternfly/patternfly-base.css";
-import PFButton from "@patternfly/patternfly/components/Button/button.css";
-import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css";
-import PFForm from "@patternfly/patternfly/components/Form/form.css";
-import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
-import AKGlobal from "../../authentik.css";
 import { ifDefined } from "lit-html/directives/if-defined";
 import "../../elements/buttons/TokenCopyButton";
+import { ModalButton } from "../../elements/buttons/ModalButton";
 
 @customElement("ak-outpost-deployment-modal")
-export class OutpostDeploymentModal extends LitElement {
+export class OutpostDeploymentModal extends ModalButton {
 
     @property({attribute: false})
     outpost?: Outpost;
 
-    static get styles(): CSSResult[] {
-        return [PFBase, PFTitle, PFButton, PFModalBox, PFForm, PFFormControl, AKGlobal];
-    }
-
-    render(): TemplateResult {
+    renderModalInner(): TemplateResult {
         return html`<div class="pf-c-modal-box__header">
                 <h1 class="pf-c-title pf-m-2xl">${t`Outpost Deployment Info`}</h1>
             </div>
@@ -54,7 +44,9 @@ export class OutpostDeploymentModal extends LitElement {
                 </form>
             </div>
             <footer class="pf-c-modal-box__footer pf-m-align-left">
-                <a class="pf-c-button pf-m-primary">${t`Close`}</a>
+                <button class="pf-c-button pf-m-primary" @click=${() => {this.open = false;}}>
+                    ${t`Close`}
+                </button>
             </footer>`;
     }
 
diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/pages/outposts/OutpostListPage.ts
index bb76ce057..8016605af 100644
--- a/web/src/pages/outposts/OutpostListPage.ts
+++ b/web/src/pages/outposts/OutpostListPage.ts
@@ -9,12 +9,13 @@ import "./OutpostHealth";
 import "./OutpostForm";
 import "./OutpostDeploymentModal";
 import "../../elements/buttons/SpinnerButton";
-import "../../elements/forms/DeleteForm";
 import "../../elements/forms/ModalForm";
+import "../../elements/forms/DeleteForm";
 import { PAGE_SIZE } from "../../constants";
 import { Outpost, OutpostsApi } from "authentik-api";
 import { DEFAULT_CONFIG } from "../../api/Config";
 import { ifDefined } from "lit-html/directives/if-defined";
+import { PFSize } from "../../elements/Spinner";
 
 @customElement("ak-outpost-list")
 export class OutpostListPage extends TablePage<Outpost> {
@@ -83,13 +84,11 @@ export class OutpostListPage extends TablePage<Outpost> {
                     ${t`Delete`}
                 </button>
             </ak-forms-delete>
-            <ak-modal-button>
+            <ak-outpost-deployment-modal .outpost=${item} size=${PFSize.Medium}>
                 <button slot="trigger" class="pf-c-button pf-m-tertiary">
                     ${t`View Deployment Info`}
                 </button>
-                <ak-outpost-deployment-modal .outpost=${item} slot="modal">
-                </ak-outpost-deployment-modal>
-            </ak-modal-button>`,
+            </ak-outpost-deployment-modal>`,
         ];
     }