diff --git a/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/CloudFoundryRadioButtonInput.tsx b/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/CloudFoundryRadioButtonInput.tsx
deleted file mode 100644
index 38aee8d6e58..00000000000
--- a/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/CloudFoundryRadioButtonInput.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import * as React from 'react';
-import { Option } from 'react-select';
-
-import {
-  IFormInputProps,
-  isStringArray,
-  Markdown,
-  orEmptyString,
-  OmitControlledInputPropsFrom,
-  StringsAsOptions,
-  validationClassName,
-} from '@spinnaker/core';
-
-import 'cloudfoundry/common/cloudFoundry.less';
-
-interface ICloudFoundryRadioButtonInputProps
-  extends IFormInputProps,
-    OmitControlledInputPropsFrom<React.TextareaHTMLAttributes<any>> {
-  options: Array<string | Option<string | number>>;
-  inputClassName?: string;
-}
-
-export const CloudFoundryRadioButtonInput = (props: ICloudFoundryRadioButtonInputProps) => {
-  const { value, validation, inputClassName, options, ...otherProps } = props;
-  const className = `RadioButtonInput radio ${orEmptyString(inputClassName)} ${validationClassName(validation)}`;
-
-  const RadioButtonsElement = ({ opts }: { opts: Array<Option<string>> }) => (
-    <div className="horizontal">
-      {opts.map(option => (
-        <div key={option.label} className={className}>
-          <label className="cloud-foundry-radio-button">
-            <input
-              type="radio"
-              {...otherProps}
-              value={option.value}
-              checked={option.value === value}
-              onChange={e => {
-                if (props.onChange) {
-                  props.onChange(e);
-                }
-              }}
-            />
-            <span className="marked">
-              <Markdown message={option.label} />
-            </span>
-          </label>
-        </div>
-      ))}
-    </div>
-  );
-
-  if (isStringArray(options)) {
-    return <StringsAsOptions strings={options}>{opts => <RadioButtonsElement opts={opts} />}</StringsAsOptions>;
-  } else {
-    return <RadioButtonsElement opts={options as Array<Option<string>>} />;
-  }
-};
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts b/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts
index eab5da20667..cc24612b0a8 100644
--- a/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts
+++ b/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts
@@ -1,2 +1 @@
-export * from './CloudFoundryRadioButtonInput';
 export * from './FormikConfigField';
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx b/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx
index e39f3d903e8..27e7c09d34d 100644
--- a/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx
+++ b/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
 
-import { FormikFormField, TextInput } from '@spinnaker/core';
-
-import { CloudFoundryRadioButtonInput } from 'cloudfoundry/presentation/forms/inputs/CloudFoundryRadioButtonInput';
+import { FormikFormField, RadioButtonInput, TextInput } from '@spinnaker/core';
 
 export interface IHealthCheckProps {
   healthCheckHttpEndpointFieldName: string;
@@ -35,7 +33,7 @@ export class HealthCheck extends React.Component<IHealthCheckProps> {
             name={healthCheckTypeFieldName}
             label="Health Check Type"
             fastField={false}
-            input={props => <CloudFoundryRadioButtonInput {...props} options={this.HEALTH_CHECK_TYPE_OPTIONS} />}
+            input={props => <RadioButtonInput {...props} inline={true} options={this.HEALTH_CHECK_TYPE_OPTIONS} />}
             onChange={value => {
               onHealthCheckTypeChange && onHealthCheckTypeChange(value);
             }}
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx
index 4f5bbabdd7f..7065a936241 100644
--- a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx
+++ b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx
@@ -8,6 +8,7 @@ import {
   IWizardPageComponent,
   IPipeline,
   IStage,
+  RadioButtonInput,
   StageArtifactSelector,
   ArtifactTypePatterns,
 } from '@spinnaker/core';
@@ -17,7 +18,6 @@ import {
   ICloudFoundryManifest,
 } from 'cloudfoundry/serverGroup/configure/serverGroupConfigurationModel.cf';
 
-import { CloudFoundryRadioButtonInput } from 'cloudfoundry/presentation/forms/inputs/CloudFoundryRadioButtonInput';
 import { ICloudFoundryEnvVar } from 'cloudfoundry/domain';
 import {
   Buildpacks,
@@ -145,10 +145,11 @@ export class CloudFoundryServerGroupConfigurationSettings
       <>
         <div className="form-group">
           <div className="col-md-11">
-            <div className="StandardFieldLayout flex-container-h margin-between-lg">
+            <div className="StandardFieldLayout flex-container-h baseline margin-between-lg">
               <div className="sm-label-right">Source Type</div>
               <div className="flex-grow">
-                <CloudFoundryRadioButtonInput
+                <RadioButtonInput
+                  inline={true}
                   value={direct ? 'direct' : 'artifact'}
                   options={[{ label: 'Artifact', value: 'artifact' }, { label: 'Form', value: 'direct' }]}
                   onChange={(e: any) => this.manifestSourceUpdated(e.target.value)}