diff --git a/lib/global-admin/addon/components/new-edit-policy/template.hbs b/lib/global-admin/addon/components/new-edit-policy/template.hbs
index 8f9a44624..5b289bce4 100644
--- a/lib/global-admin/addon/components/new-edit-policy/template.hbs
+++ b/lib/global-admin/addon/components/new-edit-policy/template.hbs
@@ -11,7 +11,7 @@
 <section class="horizontal-form container-fluid">
   {{form-name-description
       name=model.name
-      nameRequired=true
+      nameRequired=false
       nameDisabled=editing
       namePlaceholder="podSecurityPoliciesPage.new.form.name.placeholder"
       colClass="col span-7"
diff --git a/lib/global-admin/addon/components/new-edit-role/component.js b/lib/global-admin/addon/components/new-edit-role/component.js
index 9ecb37344..4840773da 100644
--- a/lib/global-admin/addon/components/new-edit-role/component.js
+++ b/lib/global-admin/addon/components/new-edit-role/component.js
@@ -26,7 +26,11 @@ export default Component.extend(NewOrEdit, {
     this.get('primaryResource.rules').forEach((rule) => {
       if ( (rule.verbs||[]).map(verb => verb.toLowerCase()).includes('use') ) {
         // PSP-ish, close enough for now
-        policyArray.push(rule);
+        if (rule.resourceNames && rule.resourceNames.length > 0) {
+          policyArray.push({
+            policyId: rule.resourceNames[0]
+          });
+        }
       } else {
         ruleArray.push(rule);
       }
@@ -54,6 +58,7 @@ export default Component.extend(NewOrEdit, {
         apiGroups: ['*'],
         type: 'policyRule',
         resource: null,
+        resources: [],
         verbs: [],
       });
     },
diff --git a/lib/global-admin/addon/components/new-edit-role/template.hbs b/lib/global-admin/addon/components/new-edit-role/template.hbs
index bb9e06b82..33d32e5a2 100644
--- a/lib/global-admin/addon/components/new-edit-role/template.hbs
+++ b/lib/global-admin/addon/components/new-edit-role/template.hbs
@@ -3,7 +3,7 @@
     {{#if editing}}
       <h1>{{t 'rolesPage.editRole'}}</h1>
     {{else}}
-      <h1>{{t 'rolesPage.addRole'}}</h1> 
+      <h1>{{t 'rolesPage.addRole'}}</h1>
     {{/if}}
   </div>
 </section>
@@ -11,7 +11,7 @@
 <section class="mb-10">
   {{form-name-description
     name=model.role.name
-    nameRequired=true
+    nameRequired=false
     nameDisabled=editing
     namePlaceholder="rolesPage.new.form.name.placeholder"
     colClass="col span-7"
diff --git a/lib/global-admin/addon/security/policies/edit/route.js b/lib/global-admin/addon/security/policies/edit/route.js
index c4b4a19ff..8c83c2865 100644
--- a/lib/global-admin/addon/security/policies/edit/route.js
+++ b/lib/global-admin/addon/security/policies/edit/route.js
@@ -4,14 +4,9 @@ import { inject as service } from '@ember/service';
 export default Route.extend({
   authzStore: service('authz-store'),
   model: function (params) {
-    return this.get('authzStore').find('podSecurityPolicyTemplate').then((policies) => {
-      const policy = policies.findBy('id', params.policy_id);
-      if (!policy) {
-        this.replaceWith('global-admin.security.policies.index');
-      }
+    return this.get('authzStore').find('podSecurityPolicyTemplate', params.policy_id).then((policy) => {
       return {
         policy,
-        policies,
       }
     });
   },
diff --git a/lib/global-admin/addon/security/policies/edit/template.hbs b/lib/global-admin/addon/security/policies/edit/template.hbs
index f01cce83e..5a4b37770 100644
--- a/lib/global-admin/addon/security/policies/edit/template.hbs
+++ b/lib/global-admin/addon/security/policies/edit/template.hbs
@@ -1 +1 @@
-{{new-edit-policy model=model editing=true}}
\ No newline at end of file
+{{new-edit-policy model=model.policy editing=true}}
\ No newline at end of file
diff --git a/lib/global-admin/addon/security/policies/new/template.hbs b/lib/global-admin/addon/security/policies/new/template.hbs
index ed2f9fa70..7df0bd968 100644
--- a/lib/global-admin/addon/security/policies/new/template.hbs
+++ b/lib/global-admin/addon/security/policies/new/template.hbs
@@ -1 +1 @@
-{{new-edit-policy model=model.policy  editing=false}}
+{{new-edit-policy model=model.policy editing=false}}
diff --git a/lib/global-admin/addon/security/roles/edit/controller.js b/lib/global-admin/addon/security/roles/edit/controller.js
deleted file mode 100644
index e09041727..000000000
--- a/lib/global-admin/addon/security/roles/edit/controller.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Controller from '@ember/controller';
-
-export default Controller.extend({
-  queryParams: ['type'],
-  type: 'project',
-});
diff --git a/lib/global-admin/addon/security/roles/new/controller.js b/lib/global-admin/addon/security/roles/new/controller.js
deleted file mode 100644
index d630f3134..000000000
--- a/lib/global-admin/addon/security/roles/new/controller.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default Controller.extend({
-});