diff --git a/lib/philomena_web/controllers/staff_controller.ex b/lib/philomena_web/controllers/staff_controller.ex
index 43c0645b..3324a5bb 100644
--- a/lib/philomena_web/controllers/staff_controller.ex
+++ b/lib/philomena_web/controllers/staff_controller.ex
@@ -17,7 +17,7 @@ defmodule PhilomenaWeb.StaffController do
       "Technical Team":
         Enum.filter(
           users,
-          &(&1.role != "admin" and &1.secondary_role in ["Site Developer", "System Administrator"])
+          &(&1.role != "admin" and &1.secondary_role in ["Site Developer", "Devops"])
         ),
       "Public Relations":
         Enum.filter(users, &(&1.role != "admin" and &1.secondary_role == "Public Relations")),
diff --git a/lib/philomena_web/templates/admin/user/_form.html.slime b/lib/philomena_web/templates/admin/user/_form.html.slime
index 2eebaaff..9234d6d1 100644
--- a/lib/philomena_web/templates/admin/user/_form.html.slime
+++ b/lib/philomena_web/templates/admin/user/_form.html.slime
@@ -17,7 +17,7 @@
       .table-list__label__input = select f, :role, ["user", "assistant", "moderator", "admin"], class: "input"
     label.table-list__label
       .table-list__label__text Secondary banner:
-      .table-list__label__input = select f, :secondary_role, [[key: "-", value: ""], "Site Developer", "System Administrator", "Philomena Contributor", "Public Relations"], class: "input"
+      .table-list__label__input = select f, :secondary_role, [[key: "-", value: ""], "Site Developer", "Devops", "Philomena Contributor", "Public Relations"], class: "input"
     label.table-list__label
       .table-list__label__text Hide staff banner:
       .table-list__label__input = checkbox f, :hide_default_role, class: "checkbox"
diff --git a/lib/philomena_web/views/user_attribution_view.ex b/lib/philomena_web/views/user_attribution_view.ex
index fc8613f0..a4546332 100644
--- a/lib/philomena_web/views/user_attribution_view.ex
+++ b/lib/philomena_web/views/user_attribution_view.ex
@@ -111,19 +111,19 @@ defmodule PhilomenaWeb.UserAttributionView do
     do: [{"label--danger", "Head Administrator"} | labels]
 
   defp staff_role(labels, %{hide_default_role: false, role: "admin"}),
-    do: [{"label--danger", "Site Administrator"} | labels]
+    do: [{"label--danger", "Administrator"} | labels]
 
   defp staff_role(labels, %{hide_default_role: false, role: "moderator", senior_staff: true}),
     do: [{"label--success", "Senior Moderator"} | labels]
 
   defp staff_role(labels, %{hide_default_role: false, role: "moderator"}),
-    do: [{"label--success", "Site Moderator"} | labels]
+    do: [{"label--success", "Moderator"} | labels]
 
   defp staff_role(labels, %{hide_default_role: false, role: "assistant", senior_staff: true}),
     do: [{"label--purple", "Senior Assistant"} | labels]
 
   defp staff_role(labels, %{hide_default_role: false, role: "assistant"}),
-    do: [{"label--purple", "Site Assistant"} | labels]
+    do: [{"label--purple", "Assistant"} | labels]
 
   defp staff_role(labels, _user),
     do: labels