diff --git a/.gitbook/assets/2.38-cluster-policies-view.png b/.gitbook/assets/2.38-cluster-policies-view.png
new file mode 100644
index 00000000..12d04238
Binary files /dev/null and b/.gitbook/assets/2.38-cluster-policies-view.png differ
diff --git a/SUMMARY.md b/SUMMARY.md
index 78bebdf3..4610a9a0 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -176,6 +176,7 @@
* [Setup](user/kubernetes/cluster/setup.md)
* [Security constraints](user/kubernetes/cluster/security.md)
* [Registries](user/kubernetes/cluster/registries.md)
+ * [Policies](user/kubernetes/cluster/policies.md)
* [Azure ACI](user/aci/README.md)
* [Dashboard](user/aci/dashboard.md)
* [Container instances](user/aci/containers/README.md)
@@ -197,16 +198,16 @@
* [Alerting](user/observability/alerting.md)
* [Policy Based Management](user/policy-based-management/README.md)
* [Policies](user/policy-based-management/policies/README.md)
- * [Kubernetes Policies](user/policy-based-management/policies/kubernetes-policies/README.md)
- * [Create a Kubernetes RBAC policy](user/policy-based-management/policies/kubernetes-policies/kubernetes-rbac-policy.md)
- * [Create a Kubernetes security policy](user/policy-based-management/policies/kubernetes-policies/kubernetes-security-policy.md)
- * [Create a Kubernetes setup policy](user/policy-based-management/policies/kubernetes-policies/kubernetes-setup-policy.md)
- * [Create a Kubernetes registry policy](user/policy-based-management/policies/kubernetes-policies/kubernetes-registry-policy.md)
- * [Docker Policies](user/policy-based-management/policies/docker-policies/README.md)
- * [Create a Docker, Swarm or Podman RBAC policy](user/policy-based-management/policies/docker-policies/rbac-policy.md)
- * [Create a Docker, Swarm or Podman security policy](user/policy-based-management/policies/docker-policies/security-policy.md)
- * [Create a Docker, Swarm or Podman setup policy](user/policy-based-management/policies/docker-policies/setup-policy.md)
- * [Create a Docker, Swarm or Podman registry policy](user/policy-based-management/policies/docker-policies/registry-policy.md)
+ * [Kubernetes Policies](user/policy-based-management/policies/kubernetes/README.md)
+ * [Create a Kubernetes RBAC policy](user/policy-based-management/policies/kubernetes/kubernetes-rbac-policy.md)
+ * [Create a Kubernetes security policy](user/policy-based-management/policies/kubernetes/kubernetes-security-policy.md)
+ * [Create a Kubernetes setup policy](user/policy-based-management/policies/kubernetes/kubernetes-setup-policy.md)
+ * [Create a Kubernetes registry policy](user/policy-based-management/policies/kubernetes/kubernetes-registry-policy.md)
+ * [Docker Policies](user/policy-based-management/policies/docker/README.md)
+ * [Create a Docker, Swarm or Podman RBAC policy](user/policy-based-management/policies/docker/rbac-policy.md)
+ * [Create a Docker, Swarm or Podman security policy](user/policy-based-management/policies/docker/security-policy.md)
+ * [Create a Docker, Swarm or Podman setup policy](user/policy-based-management/policies/docker/setup-policy.md)
+ * [Create a Docker, Swarm or Podman registry policy](user/policy-based-management/policies/docker/registry-policy.md)
* [Account settings](user/account-settings.md)
## Administering Portainer
diff --git a/user/kubernetes/cluster/README.md b/user/kubernetes/cluster/README.md
index 0050d8c8..462b7a24 100644
--- a/user/kubernetes/cluster/README.md
+++ b/user/kubernetes/cluster/README.md
@@ -27,3 +27,7 @@ This section provides information and management for your Kubernetes cluster.
{% content-ref url="registries.md" %}
[registries.md](registries.md)
{% endcontent-ref %}
+
+{% content-ref url="policies.md" %}
+[policies.md](policies.md)
+{% endcontent-ref %}
diff --git a/user/kubernetes/cluster/policies.md b/user/kubernetes/cluster/policies.md
new file mode 100644
index 00000000..cbf26b65
--- /dev/null
+++ b/user/kubernetes/cluster/policies.md
@@ -0,0 +1,11 @@
+# Policies
+
+{% hint style="info" %}
+As Policy Based Management is a beta feature, this view is only available if Policy Based Management is [enabled from the settings menu](../../../admin/settings/general.md#additional-functionality).
+{% endhint %}
+
+To view any policies that apply to the selected environment, from the menu expand **Cluster** then select **Policies**.
+
+Policy details are read-only for standard users and can be updated by admin and operator users. For information on managing policies, see the [Policies](../../policy-based-management/policies/) page.
+
+
diff --git a/user/policy-based-management/policies/README.md b/user/policy-based-management/policies/README.md
index d50911b0..2d9c65f7 100644
--- a/user/policy-based-management/policies/README.md
+++ b/user/policy-based-management/policies/README.md
@@ -34,12 +34,12 @@ There are multiple policy types available, depending on the environment type you
After selecting a policy type, select **Continue** at the bottom of the page to open the configuration form. The fields shown will vary depending on the policy you are creating, and each form guides you through the required settings for that specific policy. Select an environment type below for more details on creating the policy.
-{% content-ref url="kubernetes-policies/" %}
-[kubernetes-policies](kubernetes-policies/)
+{% content-ref url="kubernetes/" %}
+[kubernetes](kubernetes/)
{% endcontent-ref %}
-{% content-ref url="docker-policies/" %}
-[docker-policies](docker-policies/)
+{% content-ref url="docker/" %}
+[docker](docker/)
{% endcontent-ref %}
## View policy details
@@ -78,7 +78,7 @@ The attachment tab displays details about the environments attached to the polic
### Settings
-The Settings tab shows the policy configuration. Settings vary by policy type. Details for each policy type are covered in the [Kubernetes policies](kubernetes-policies/) and [Docker policies](docker-policies/) sections of this documentation.
+The Settings tab shows the policy configuration. Settings vary by policy type. Details for each policy type are covered in the [Kubernetes policies](kubernetes/) and [Docker policies](docker/) sections of this documentation.
## Remove a policy
diff --git a/user/policy-based-management/policies/docker-policies/README.md b/user/policy-based-management/policies/docker/README.md
similarity index 96%
rename from user/policy-based-management/policies/docker-policies/README.md
rename to user/policy-based-management/policies/docker/README.md
index d05b2717..4673af65 100644
--- a/user/policy-based-management/policies/docker-policies/README.md
+++ b/user/policy-based-management/policies/docker/README.md
@@ -1,4 +1,4 @@
-# Docker
+# Docker Policies
The following section describes the details of creating a policy for Docker, Swarm or Podman environments.
diff --git a/user/policy-based-management/policies/docker-policies/rbac-policy.md b/user/policy-based-management/policies/docker/rbac-policy.md
similarity index 100%
rename from user/policy-based-management/policies/docker-policies/rbac-policy.md
rename to user/policy-based-management/policies/docker/rbac-policy.md
diff --git a/user/policy-based-management/policies/docker-policies/registry-policy.md b/user/policy-based-management/policies/docker/registry-policy.md
similarity index 100%
rename from user/policy-based-management/policies/docker-policies/registry-policy.md
rename to user/policy-based-management/policies/docker/registry-policy.md
diff --git a/user/policy-based-management/policies/docker-policies/security-policy.md b/user/policy-based-management/policies/docker/security-policy.md
similarity index 100%
rename from user/policy-based-management/policies/docker-policies/security-policy.md
rename to user/policy-based-management/policies/docker/security-policy.md
diff --git a/user/policy-based-management/policies/docker-policies/setup-policy.md b/user/policy-based-management/policies/docker/setup-policy.md
similarity index 100%
rename from user/policy-based-management/policies/docker-policies/setup-policy.md
rename to user/policy-based-management/policies/docker/setup-policy.md
diff --git a/user/policy-based-management/policies/kubernetes-policies/README.md b/user/policy-based-management/policies/kubernetes/README.md
similarity index 96%
rename from user/policy-based-management/policies/kubernetes-policies/README.md
rename to user/policy-based-management/policies/kubernetes/README.md
index 0421d3bc..76700693 100644
--- a/user/policy-based-management/policies/kubernetes-policies/README.md
+++ b/user/policy-based-management/policies/kubernetes/README.md
@@ -1,4 +1,4 @@
-# Kubernetes
+# Kubernetes Policies
The following section describes the details of creating a policy for Kubernetes environments.
diff --git a/user/policy-based-management/policies/kubernetes-policies/kubernetes-rbac-policy.md b/user/policy-based-management/policies/kubernetes/kubernetes-rbac-policy.md
similarity index 100%
rename from user/policy-based-management/policies/kubernetes-policies/kubernetes-rbac-policy.md
rename to user/policy-based-management/policies/kubernetes/kubernetes-rbac-policy.md
diff --git a/user/policy-based-management/policies/kubernetes-policies/kubernetes-registry-policy.md b/user/policy-based-management/policies/kubernetes/kubernetes-registry-policy.md
similarity index 100%
rename from user/policy-based-management/policies/kubernetes-policies/kubernetes-registry-policy.md
rename to user/policy-based-management/policies/kubernetes/kubernetes-registry-policy.md
diff --git a/user/policy-based-management/policies/kubernetes-policies/kubernetes-security-policy.md b/user/policy-based-management/policies/kubernetes/kubernetes-security-policy.md
similarity index 100%
rename from user/policy-based-management/policies/kubernetes-policies/kubernetes-security-policy.md
rename to user/policy-based-management/policies/kubernetes/kubernetes-security-policy.md
diff --git a/user/policy-based-management/policies/kubernetes-policies/kubernetes-setup-policy.md b/user/policy-based-management/policies/kubernetes/kubernetes-setup-policy.md
similarity index 100%
rename from user/policy-based-management/policies/kubernetes-policies/kubernetes-setup-policy.md
rename to user/policy-based-management/policies/kubernetes/kubernetes-setup-policy.md
diff --git a/whats-new.md b/whats-new.md
index 413c9b32..7a66166c 100644
--- a/whats-new.md
+++ b/whats-new.md
@@ -20,6 +20,6 @@ You can read more about our release principles in our [lifecycle policy](start/l
Since the initial release of [Policies](user/policy-based-management/policies/) as part of the Policy Based Management feature, improvements and new functionality have been added to simplify creating centralized policies across groups of environments.
-Along with [numerous fixes and UI improvements](release-notes.md#release-2.38.0-sts), this release introduces policy templates that provide preconfigured policies, making policy creation possible in just a few clicks. Templates are currently available for [Kubernetes security ](user/policy-based-management/policies/kubernetes-policies/kubernetes-security-policy.md)and [Docker security](user/policy-based-management/policies/docker-policies/security-policy.md) policies, with more to come in future releases.
+Along with [numerous fixes and UI improvements](release-notes.md#release-2.38.0-sts), this release introduces policy templates that provide preconfigured policies, making policy creation possible in just a few clicks. Templates are currently available for [Kubernetes security ](user/policy-based-management/policies/kubernetes/kubernetes-security-policy.md)and [Docker security](user/policy-based-management/policies/docker/security-policy.md) policies, with more to come in future releases.