diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 4eb66323..56ef25ba 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -75,7 +75,6 @@ def settings(application_id):
     # refactor like portfolio admin render function
     application = Applications.get(application_id)
     form = ApplicationForm(name=application.name, description=application.description)
-    csp_roles = [role.value for role in CSPRole]
 
     return render_template(
         "portfolios/applications/settings.html",
@@ -83,7 +82,6 @@ def settings(application_id):
         form=form,
         environments_obj=get_environments_obj_for_app(application=application),
         env_forms=serialize_env_member_forms(application=application),
-        csp_roles=csp_roles,
     )
 
 
diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html
index d2e5faff..c629c440 100644
--- a/templates/fragments/applications/edit_environments.html
+++ b/templates/fragments/applications/edit_environments.html
@@ -87,10 +87,10 @@
               <div>
                 {{ RolePanel(users=unassigned) }}
 
-                {% for role in csp_roles %}
-                  {{ RolePanel(users=members_by_role[role], role=role) }}
-                {% endfor %}
-              </div>
+                  {% for role, members in members_by_role.items() %}
+                    {{ RolePanel(users=members, role=role) }}
+                  {% endfor %}
+                </div>
             {% endcall %}
 
             {% call ToggleSection(section_name="edit") %}