diff --git a/lib/foreman_remote_execution/engine.rb b/lib/foreman_remote_execution/engine.rb
index 96e523b70..b92e20786 100644
--- a/lib/foreman_remote_execution/engine.rb
+++ b/lib/foreman_remote_execution/engine.rb
@@ -47,7 +47,7 @@ class Engine < ::Rails::Engine
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 3.8'
+        requires_foreman '>= 3.9'
         register_global_js_file 'global'
         register_gettext
 
diff --git a/webpack/JobWizard/index.js b/webpack/JobWizard/index.js
index 913754cd2..3428f81af 100644
--- a/webpack/JobWizard/index.js
+++ b/webpack/JobWizard/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Title, Flex, FlexItem, Button } from '@patternfly/react-core';
+import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { JobWizard } from './JobWizard';
@@ -18,23 +18,14 @@ const JobWizardPage = ({ location: { search } }) => {
       header={title}
       breadcrumbOptions={breadcrumbOptions}
       searchable={false}
-      beforeToolbarComponent={
-        <Flex>
-          <FlexItem>
-            <Title headingLevel="h2" size="2xl">
-              {title}
-            </Title>
-          </FlexItem>
-          <FlexItem align={{ default: 'alignRight' }}>
-            <Button
-              variant="link"
-              component="a"
-              href={`/old/job_invocations/new${search}`}
-            >
-              {__('Use legacy form')}
-            </Button>
-          </FlexItem>
-        </Flex>
+      toolbarButtons={
+        <Button
+          variant="link"
+          component="a"
+          href={`/old/job_invocations/new${search}`}
+        >
+          {__('Use legacy form')}
+        </Button>
       }
       pageSectionType="wizard"
     >