diff --git a/openshift/setup.yml b/openshift/setup.yml
index e8ec11735..3c152d799 100644
--- a/openshift/setup.yml
+++ b/openshift/setup.yml
@@ -7,29 +7,6 @@ controller_components:
   - job_templates
   - workflow_job_templates
 
-controller_credential_types:
-  # Ideally, we would not need to use this and could just re-use the OCP credential for the inventory plugin
-  - name: OCPV inventory credential
-    kind: cloud
-    inputs:
-      fields:
-        - id: host
-          type: string
-          label: OpenShift or Kubernetes API Endpoint
-          secret: false
-        - id: bearer_token
-          type: string
-          label: API authentication bearer token
-          secret: true
-        - id: verify_ssl
-          type: boolean
-          label: Verify SSL
-    injectors:
-      env:
-        K8S_AUTH_HOST: "{% raw %}{  { host  }}{% endraw %}"
-        K8S_AUTH_API_KEY: "{% raw %}{  { bearer_token  }}{% endraw %}"
-        K8S_AUTH_VERIFY_SSL: "{% raw %}{  { verify_ssl  }}{% endraw %}"
-
 controller_credentials:
   - name: OpenShift Credential
     organization: Default
@@ -40,22 +17,13 @@ controller_credentials:
       bearer_token: CHANGEME
       verify_ssl: false
 
-  - name: OCP-V Inventory Credential
-    organization: Default
-    credential_type: OCPV inventory credential
-    state: exists
-    inputs:
-      host: CHANGEME
-      bearer_token: CHANGEME
-      verify_ssl: false
-
 controller_inventory_sources:
   - name: OpenShift CNV Inventory
     inventory: Demo Inventory
     source: scm
     source_project: Ansible official demo project
     source_path: openshift/inventory.kubevirt.yml
-    credential: OCP-V Inventory Credential
+    credential: OpenShift Credential
     update_on_launch: false
 
 controller_templates:
@@ -138,7 +106,7 @@ controller_templates:
     notification_templates_error: Telemetry
     survey_enabled: true
     extra_vars:
-      state: absent
+      instance_state: absent
     survey:
       name: ''
       description: ''