diff --git a/helm/cluster_setup/templates/hubble-relay-networkpolicy.yaml b/helm/cluster_setup/templates/cilium/hubble-relay-networkpolicy.yaml
similarity index 100%
rename from helm/cluster_setup/templates/hubble-relay-networkpolicy.yaml
rename to helm/cluster_setup/templates/cilium/hubble-relay-networkpolicy.yaml
diff --git a/helm/cluster_setup/templates/hubble-ui-networkpolicy.yaml b/helm/cluster_setup/templates/cilium/hubble-ui-networkpolicy.yaml
similarity index 100%
rename from helm/cluster_setup/templates/hubble-ui-networkpolicy.yaml
rename to helm/cluster_setup/templates/cilium/hubble-ui-networkpolicy.yaml
diff --git a/helm/cluster_setup/templates/kubedns-networkpolicy.yaml b/helm/cluster_setup/templates/cilium/kubedns-networkpolicy.yaml
similarity index 100%
rename from helm/cluster_setup/templates/kubedns-networkpolicy.yaml
rename to helm/cluster_setup/templates/cilium/kubedns-networkpolicy.yaml
diff --git a/helm/cluster_setup/templates/admin-without-secrets-cluster-role.yaml b/helm/cluster_setup/templates/rbac/admin-without-secrets-cluster-role.yaml
similarity index 100%
rename from helm/cluster_setup/templates/admin-without-secrets-cluster-role.yaml
rename to helm/cluster_setup/templates/rbac/admin-without-secrets-cluster-role.yaml
diff --git a/helm/cluster_setup/templates/log-access-cluster-role-binding.yaml b/helm/cluster_setup/templates/rbac/log-access-cluster-role-binding.yaml
similarity index 100%
rename from helm/cluster_setup/templates/log-access-cluster-role-binding.yaml
rename to helm/cluster_setup/templates/rbac/log-access-cluster-role-binding.yaml
diff --git a/helm/cluster_setup/templates/log-access-cluster-role.yaml b/helm/cluster_setup/templates/rbac/log-access-cluster-role.yaml
similarity index 100%
rename from helm/cluster_setup/templates/log-access-cluster-role.yaml
rename to helm/cluster_setup/templates/rbac/log-access-cluster-role.yaml
diff --git a/helm/cluster_setup/templates/shell-access-cluster-role-binding.yaml b/helm/cluster_setup/templates/rbac/shell-access-cluster-role-binding.yaml
similarity index 100%
rename from helm/cluster_setup/templates/shell-access-cluster-role-binding.yaml
rename to helm/cluster_setup/templates/rbac/shell-access-cluster-role-binding.yaml
diff --git a/helm/cluster_setup/templates/shell-access-cluster-role.yaml b/helm/cluster_setup/templates/rbac/shell-access-cluster-role.yaml
similarity index 100%
rename from helm/cluster_setup/templates/shell-access-cluster-role.yaml
rename to helm/cluster_setup/templates/rbac/shell-access-cluster-role.yaml