diff --git a/frontend/integration-tests/tests/olm/descriptors.scenario.ts b/frontend/integration-tests/tests/olm/descriptors.scenario.ts
index ca9f90a8ca4..d7dc27a9a58 100644
--- a/frontend/integration-tests/tests/olm/descriptors.scenario.ts
+++ b/frontend/integration-tests/tests/olm/descriptors.scenario.ts
@@ -47,7 +47,7 @@ const inputValueFor = (capability: SpecCapability) => async(el: ElementFinder) =
       limits: {cpu: await el.$$('input').get(0).getAttribute('value'), memory: await el.$$('input').get(1).getAttribute('value')},
       requests: {cpu: await el.$$('input').get(2).getAttribute('value'), memory: await el.$$('input').get(3).getAttribute('value')},
     };
-    case SpecCapability.booleanSwitch: return (await el.$('.bootstrap-switch').getAttribute('class')).includes('bootstrap-switch-on');
+    case SpecCapability.booleanSwitch: return (await el.$('.pf-c-switch__input').getAttribute('checked')) !== 'false';
     case SpecCapability.password: return el.$('input').getAttribute('value');
     case SpecCapability.checkbox: return (await el.$('input').getAttribute('checked')) !== 'false';
     case SpecCapability.imagePullPolicy: return el.$('input[type=\'radio\']:checked').getAttribute('value');
diff --git a/frontend/public/components/operator-lifecycle-manager/create-operand.tsx b/frontend/public/components/operator-lifecycle-manager/create-operand.tsx
index 5bca2674ab4..7b8c5af80e5 100644
--- a/frontend/public/components/operator-lifecycle-manager/create-operand.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/create-operand.tsx
@@ -6,8 +6,7 @@ import { safeDump } from 'js-yaml';
 import * as _ from 'lodash-es';
 import { PropertyPath } from 'lodash';
 import * as classNames from 'classnames';
-import { Switch } from 'patternfly-react';
-import { Alert, ActionGroup, Button } from '@patternfly/react-core';
+import { Alert, ActionGroup, Button, Switch } from '@patternfly/react-core';
 import { JSONSchema6TypeName } from 'json-schema';
 
 import {
@@ -346,11 +345,11 @@ export const CreateOperandForm: React.FC<CreateOperandFormProps> = (props) => {
     }
     if (field.capabilities.includes(SpecCapability.booleanSwitch)) {
       return <Switch
-        value={formValues[field.path]}
-        onChange={(el, val) => setFormValues(values => ({...values, [field.path]: val}))}
-        onText="True"
-        offText="False"
-        bsSize="mini" />;
+        id={field.path}
+        isChecked={formValues[field.path]}
+        onChange={(val) => setFormValues(values => ({...values, [field.path]: val}))}
+        label="True"
+        labelOff="False" />;
     }
     if (field.capabilities.includes(SpecCapability.imagePullPolicy)) {
       return <RadioGroup
diff --git a/frontend/public/components/operator-lifecycle-manager/descriptors/spec/index.tsx b/frontend/public/components/operator-lifecycle-manager/descriptors/spec/index.tsx
index ae2dc108a4e..afed5153b27 100644
--- a/frontend/public/components/operator-lifecycle-manager/descriptors/spec/index.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/descriptors/spec/index.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react';
 import * as _ from 'lodash-es';
 import { Map as ImmutableMap } from 'immutable';
-import { Tooltip } from '@patternfly/react-core';
+import { Switch, Tooltip } from '@patternfly/react-core';
 import { EyeIcon, EyeSlashIcon } from '@patternfly/react-icons';
-import { Switch } from 'patternfly-react';
 
 import { SpecCapability, DescriptorProps, CapabilityProps } from '../types';
 import { ResourceRequirementsModalLink } from './resource-requirements';
@@ -59,14 +58,13 @@ const BooleanSwitch: React.FC<SpecCapabilityProps> = (props) => {
 
   return <div className="co-spec-descriptor--switch">
     <Switch
-      value={value}
-      onChange={(el, val) => {
+      isChecked={value}
+      onChange={(val) => {
         setValue(val);
         setConfirmed(false);
       }}
-      onText="True"
-      offText="False"
-      bsSize="mini" />
+      label="True"
+      labelOff="False" />
     &nbsp;&nbsp;
     {value !== props.value && confirmed && <LoadingInline />}
     {value !== props.value && !confirmed && <React.Fragment>
diff --git a/frontend/public/vendor.scss b/frontend/public/vendor.scss
index a7f3baab392..2dfe8bb838e 100644
--- a/frontend/public/vendor.scss
+++ b/frontend/public/vendor.scss
@@ -40,8 +40,6 @@
 @import '~patternfly/dist/sass/patternfly/list-view';
 @import '~patternfly/dist/sass/patternfly/popovers';
 @import '~patternfly/dist/sass/patternfly/forms';
-@import '~patternfly/dist/sass/patternfly/dependencies/bootstrap-switch/bootstrap-switch';
-@import '~patternfly/dist/sass/patternfly/bootstrap-switch';
 @import "~xterm/dist/addons/fullscreen/fullscreen";
 @import "~patternfly-react/dist/sass/field-level-help";
 @import "~patternfly-react/dist/sass/modeless-overlay";