diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html
index e4feab481..8e4e20ce5 100644
--- a/authentik/core/templates/base/skeleton.html
+++ b/authentik/core/templates/base/skeleton.html
@@ -10,7 +10,10 @@
         <title>{% block title %}{% trans title|default:config.authentik.branding.title %}{% endblock %}</title>
         <link rel="icon" type="image/png" href="{% static 'dist/assets/icons/icon.png' %}?v={{ ak_version }}">
         <link rel="shortcut icon" type="image/png" href="{% static 'dist/assets/icons/icon.png' %}?v={{ ak_version }}">
-        <link rel="stylesheet" type="text/css" href="{% static 'dist/patternfly.min.css' %}?v={{ ak_version }}">
+        <link rel="stylesheet" type="text/css" href="{% static 'dist/patternfly-base.css' %}?v={{ ak_version }}">
+        <link rel="stylesheet" type="text/css" href="{% static 'dist/page.css' %}?v={{ ak_version }}">
+        <link rel="stylesheet" type="text/css" href="{% static 'dist/empty-state.css' %}?v={{ ak_version }}">
+        <link rel="stylesheet" type="text/css" href="{% static 'dist/spinner.css' %}?v={{ ak_version }}">
         <link rel="stylesheet" type="text/css" href="{% static 'dist/authentik.css' %}?v={{ ak_version }}">
         <script src="{% static 'dist/poly.js' %}?v={{ ak_version }}" type="module"></script>
         <script>window["polymerSkipLoadingFontRoboto"] = true;</script>
diff --git a/web/rollup.config.js b/web/rollup.config.js
index f207c7481..c761f2bc9 100644
--- a/web/rollup.config.js
+++ b/web/rollup.config.js
@@ -15,8 +15,10 @@ const extensions = [
 const resources = [
     { src: "node_modules/rapidoc/dist/rapidoc-min.js", dest: "dist/" },
 
-    { src: "node_modules/@patternfly/patternfly/patternfly.min.css", dest: "dist/" },
-    { src: "node_modules/@patternfly/patternfly/patternfly.min.css.map", dest: "dist/" },
+    { src: "node_modules/@patternfly/patternfly/patternfly-base.css", dest: "dist/" },
+    { src: "node_modules/@patternfly/patternfly/components/Page/page.css", dest: "dist/" },
+    { src: "node_modules/@patternfly/patternfly/components/EmptyState/empty-state.css", dest: "dist/" },
+    { src: "node_modules/@patternfly/patternfly/components/Spinner/spinner.css", dest: "dist/" },
     { src: "src/authentik.css", dest: "dist/" },
 
     { src: "node_modules/@patternfly/patternfly/assets/*", dest: "dist/assets/" },
diff --git a/web/src/interfaces/admin/index.html b/web/src/interfaces/admin/index.html
index 9e2f5de0f..22dc2da87 100644
--- a/web/src/interfaces/admin/index.html
+++ b/web/src/interfaces/admin/index.html
@@ -5,7 +5,10 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         <link rel="icon" type="image/png" href="/static/dist/assets/icons/icon.png">
         <link rel="shortcut icon" type="image/png" href="/static/dist/assets/icons/icon.png">
-        <link rel="stylesheet" type="text/css" href="/static/dist/patternfly.min.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/patternfly-base.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/page.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/empty-state.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/spinner.css">
         <link rel="stylesheet" type="text/css" href="/static/dist/authentik.css">
         <script src="/static/dist/poly.js" type="module"></script>
         <script>window["polymerSkipLoadingFontRoboto"] = true;</script>
diff --git a/web/src/interfaces/flow/index.html b/web/src/interfaces/flow/index.html
index 1d91456da..9f7cddc8c 100644
--- a/web/src/interfaces/flow/index.html
+++ b/web/src/interfaces/flow/index.html
@@ -5,7 +5,10 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         <link rel="icon" type="image/png" href="/static/dist/assets/icons/icon.png">
         <link rel="shortcut icon" type="image/png" href="/static/dist/assets/icons/icon.png">
-        <link rel="stylesheet" type="text/css" href="/static/dist/patternfly.min.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/patternfly-base.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/page.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/empty-state.css">
+        <link rel="stylesheet" type="text/css" href="/static/dist/spinner.css">
         <link rel="stylesheet" type="text/css" href="/static/dist/authentik.css">
         <script src="/static/dist/poly.js" type="module"></script>
         <script>window["polymerSkipLoadingFontRoboto"] = true;</script>