diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml
index 908117eae5..e7c19847b6 100644
--- a/roles/openshift/object/tasks/main.yml
+++ b/roles/openshift/object/tasks/main.yml
@@ -21,12 +21,6 @@
 - name: Call `oc apply` on the copied file
   shell: oc -n {{app}} apply -f {{tmpfile.path}}
   run_once: true
-  when: global_object is not defined or not global_object
-
-- name: GLOBAL call `oc apply` on the copied file
-  shell: oc apply -f {{tmpfile.path}}
-  run_once: true
-  when: global_object is defined and global_object
 
 - name: Delete temporary file
   file: path={{tmpfile.path}} state=absent
diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml
index 728788e30c..f9fddca6c0 100644
--- a/roles/openshift/project/tasks/main.yml
+++ b/roles/openshift/project/tasks/main.yml
@@ -35,8 +35,6 @@
     name: openshift/object
   vars:
     template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml"
-    # Namespace-local roles are unusable until Openshift 3.6. Remove this global: true when upgraded.
-    global_object: true
 
 - name: appowners.yml
   include_role:
diff --git a/roles/openshift/project/templates/role-appowners.yml b/roles/openshift/project/templates/role-appowners.yml
index bff777a20a..2abb710630 100644
--- a/roles/openshift/project/templates/role-appowners.yml
+++ b/roles/openshift/project/templates/role-appowners.yml
@@ -1,5 +1,6 @@
 apiVersion: v1
-kind: Role
+# Namespace-local roles did not work until openshift 3.6
+kind: ClusterRole
 metadata:
   annotations:
     openshift.io/description: An application owner. Can view everything but ConfigMaps.