diff --git a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
index 19ad76c796..b0d27ccc6e 100644
--- a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
+++ b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
@@ -7,16 +7,11 @@ import { CheckboxField, FieldTooltip } from '../FormField';
 
 const FieldHeader = styled.div`
   display: flex;
-  justify-content: space-between;
-  padding-bottom: var(--pf-c-form__label--PaddingBottom);
-
-  label {
-    --pf-c-form__label--PaddingBottom: 0px;
-  }
 `;
 
 const StyledCheckboxField = styled(CheckboxField)`
   --pf-c-check__label--FontSize: var(--pf-c-form__label--FontSize);
+  margin-left: auto;
 `;
 
 function FieldWithPrompt({
diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
index c721b56789..3b75634928 100644
--- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
@@ -25,17 +25,33 @@ function CredentialAdd({ me }) {
     result: credentialId,
   } = useRequest(
     useCallback(
-      async values => {
-        const { inputs, organization, ...remainingValues } = values;
+      async (values, credentialTypesMap) => {
+        const { inputs: credentialTypeInputs } = credentialTypesMap[
+          values.credential_type
+        ];
+
+        const {
+          inputs,
+          organization,
+          passwordPrompts,
+          ...remainingValues
+        } = values;
+
         const nonPluginInputs = {};
         const pluginInputs = {};
-        Object.entries(inputs).forEach(([key, value]) => {
-          if (value.credential && value.inputs) {
-            pluginInputs[key] = value;
+        const possibleFields = credentialTypeInputs.fields || [];
+
+        possibleFields.forEach(field => {
+          const input = inputs[field.id];
+          if (input.credential && input.inputs) {
+            pluginInputs[field.id] = input;
+          } else if (passwordPrompts[field.id]) {
+            nonPluginInputs[field.id] = 'ASK';
           } else {
-            nonPluginInputs[key] = value;
+            nonPluginInputs[field.id] = input;
           }
         });
+
         const {
           data: { id: newCredentialId },
         } = await CredentialsAPI.create({
@@ -44,18 +60,17 @@ function CredentialAdd({ me }) {
           inputs: nonPluginInputs,
           ...remainingValues,
         });
-        const inputSourceRequests = [];
-        Object.entries(pluginInputs).forEach(([key, value]) => {
-          inputSourceRequests.push(
+
+        await Promise.all(
+          Object.entries(pluginInputs).map(([key, value]) =>
             CredentialInputSourcesAPI.create({
               input_field_name: key,
               metadata: value.inputs,
               source_credential: value.credential.id,
               target_credential: newCredentialId,
             })
-          );
-        });
-        await Promise.all(inputSourceRequests);
+          )
+        );
 
         return newCredentialId;
       },
@@ -74,10 +89,13 @@ function CredentialAdd({ me }) {
       try {
         const {
           data: { results: loadedCredentialTypes },
-        } = await CredentialTypesAPI.read({
-          or__namespace: ['gce', 'scm', 'ssh'],
-        });
-        setCredentialTypes(loadedCredentialTypes);
+        } = await CredentialTypesAPI.read();
+        setCredentialTypes(
+          loadedCredentialTypes.reduce((credentialTypesMap, credentialType) => {
+            credentialTypesMap[credentialType.id] = credentialType;
+            return credentialTypesMap;
+          }, {})
+        );
       } catch (err) {
         setError(err);
       } finally {
@@ -92,7 +110,7 @@ function CredentialAdd({ me }) {
   };
 
   const handleSubmit = async values => {
-    await submitRequest(values);
+    await submitRequest(values, credentialTypes);
   };
 
   if (error) {
diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
index c348c6e252..24c7e9df0a 100644
--- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx
@@ -5,9 +5,12 @@ import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
-import { sleep } from '../../../../testUtils/testUtils';
 
-import { CredentialsAPI, CredentialTypesAPI } from '../../../api';
+import {
+  CredentialsAPI,
+  CredentialInputSourcesAPI,
+  CredentialTypesAPI,
+} from '../../../api';
 import CredentialAdd from './CredentialAdd';
 
 jest.mock('../../../api');
@@ -15,58 +18,6 @@ jest.mock('../../../api');
 CredentialTypesAPI.read.mockResolvedValue({
   data: {
     results: [
-      {
-        id: 2,
-        type: 'credential_type',
-        url: '/api/v2/credential_types/2/',
-        related: {
-          credentials: '/api/v2/credential_types/2/credentials/',
-          activity_stream: '/api/v2/credential_types/2/activity_stream/',
-        },
-        summary_fields: {
-          user_capabilities: {
-            edit: false,
-            delete: false,
-          },
-        },
-        created: '2020-02-12T19:42:43.551238Z',
-        modified: '2020-02-12T19:43:03.164800Z',
-        name: 'Source Control',
-        description: '',
-        kind: 'scm',
-        namespace: 'scm',
-        managed_by_tower: true,
-        inputs: {
-          fields: [
-            {
-              id: 'username',
-              label: 'Username',
-              type: 'string',
-            },
-            {
-              id: 'password',
-              label: 'Password',
-              type: 'string',
-              secret: true,
-            },
-            {
-              id: 'ssh_key_data',
-              label: 'Source Control Private Key',
-              type: 'string',
-              format: 'ssh_private_key',
-              secret: true,
-              multiline: true,
-            },
-            {
-              id: 'ssh_key_unlock',
-              label: 'Private Key Passphrase',
-              type: 'string',
-              secret: true,
-            },
-          ],
-        },
-        injectors: {},
-      },
       {
         id: 1,
         type: 'credential_type',
@@ -157,48 +108,98 @@ describe('<CredentialAdd />', () => {
   let wrapper;
   let history;
 
-  beforeEach(async () => {
-    history = createMemoryHistory({ initialEntries: ['/credentials'] });
-    await act(async () => {
-      wrapper = mountWithContexts(<CredentialAdd />, {
-        context: { router: { history } },
+  describe('Initial GET request succeeds', () => {
+    beforeEach(async () => {
+      history = createMemoryHistory({ initialEntries: ['/credentials'] });
+      await act(async () => {
+        wrapper = mountWithContexts(<CredentialAdd />, {
+          context: { router: { history } },
+        });
       });
     });
-  });
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
-  test('Initially renders successfully', () => {
-    expect(wrapper.length).toBe(1);
-  });
-  test('handleSubmit should call the api and redirect to details page', async () => {
-    await waitForElement(wrapper, 'isLoading', el => el.length === 0);
-
-    wrapper.find('CredentialForm').prop('onSubmit')({
-      user: 1,
-      organization: null,
-      name: 'foo',
-      description: 'bar',
-      credential_type: '2',
-      inputs: {},
+    afterEach(() => {
+      wrapper.unmount();
     });
-    await sleep(1);
-    expect(CredentialsAPI.create).toHaveBeenCalledWith({
-      user: 1,
-      organization: null,
-      name: 'foo',
-      description: 'bar',
-      credential_type: '2',
-      inputs: {},
+
+    test('handleSubmit should call the api and redirect to details page', async () => {
+      await waitForElement(wrapper, 'isLoading', el => el.length === 0);
+      await act(async () => {
+        wrapper.find('CredentialForm').prop('onSubmit')({
+          user: 1,
+          organization: null,
+          name: 'foo',
+          description: 'bar',
+          credential_type: '1',
+          inputs: {
+            username: {
+              credential: {
+                id: 1,
+                name: 'Some cred',
+              },
+              inputs: {
+                foo: 'bar',
+              },
+            },
+            password: 'foo',
+            ssh_key_data: 'bar',
+            ssh_public_key_data: 'baz',
+            ssh_key_unlock: 'foobar',
+            become_method: '',
+            become_username: '',
+            become_password: '',
+          },
+          passwordPrompts: {
+            become_password: true,
+          },
+        });
+      });
+      expect(CredentialsAPI.create).toHaveBeenCalledWith({
+        user: 1,
+        organization: null,
+        name: 'foo',
+        description: 'bar',
+        credential_type: '1',
+        inputs: {
+          password: 'foo',
+          ssh_key_data: 'bar',
+          ssh_public_key_data: 'baz',
+          ssh_key_unlock: 'foobar',
+          become_method: '',
+          become_username: '',
+          become_password: 'ASK',
+        },
+      });
+      expect(CredentialInputSourcesAPI.create).toHaveBeenCalledWith({
+        input_field_name: 'username',
+        metadata: {
+          foo: 'bar',
+        },
+        source_credential: 1,
+        target_credential: 13,
+      });
+      expect(history.location.pathname).toBe('/credentials/13/details');
+    });
+
+    test('handleCancel should return the user back to the inventories list', async () => {
+      await waitForElement(wrapper, 'isLoading', el => el.length === 0);
+      wrapper.find('Button[aria-label="Cancel"]').simulate('click');
+      expect(history.location.pathname).toEqual('/credentials');
     });
-    expect(history.location.pathname).toBe('/credentials/13/details');
   });
 
-  test('handleCancel should return the user back to the inventories list', async () => {
-    await waitForElement(wrapper, 'isLoading', el => el.length === 0);
-    wrapper.find('Button[aria-label="Cancel"]').simulate('click');
-    expect(history.location.pathname).toEqual('/credentials');
+  describe('Initial GET request fails', () => {
+    test('shows error when initial GET request fails', async () => {
+      CredentialTypesAPI.read.mockRejectedValue(new Error());
+      history = createMemoryHistory({ initialEntries: ['/credentials'] });
+      await act(async () => {
+        wrapper = mountWithContexts(<CredentialAdd />, {
+          context: { router: { history } },
+        });
+      });
+      wrapper.update();
+      expect(wrapper.find('ContentError').length).toBe(1);
+      wrapper.unmount();
+    });
   });
 });
diff --git a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
index aef18ea8e9..79fe6c5f7c 100644
--- a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useState, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { object } from 'prop-types';
-
 import { CardBody } from '../../../components/Card';
 import {
   CredentialsAPI,
@@ -22,8 +21,34 @@ function CredentialEdit({ credential, me }) {
 
   const { error: submitError, request: submitRequest, result } = useRequest(
     useCallback(
-      async (values, inputSourceMap) => {
-        const createAndUpdateInputSources = pluginInputs =>
+      async (values, credentialTypesMap, inputSourceMap) => {
+        const { inputs: credentialTypeInputs } = credentialTypesMap[
+          values.credential_type
+        ];
+
+        const {
+          inputs,
+          organization,
+          passwordPrompts,
+          ...remainingValues
+        } = values;
+
+        const nonPluginInputs = {};
+        const pluginInputs = {};
+        const possibleFields = credentialTypeInputs.fields || [];
+
+        possibleFields.forEach(field => {
+          const input = inputs[field.id];
+          if (input.credential && input.inputs) {
+            pluginInputs[field.id] = input;
+          } else if (passwordPrompts[field.id]) {
+            nonPluginInputs[field.id] = 'ASK';
+          } else {
+            nonPluginInputs[field.id] = input;
+          }
+        });
+
+        const createAndUpdateInputSources = () =>
           Object.entries(pluginInputs).map(([fieldName, fieldValue]) => {
             if (!inputSourceMap[fieldName]) {
               return CredentialInputSourcesAPI.create({
@@ -46,27 +71,15 @@ function CredentialEdit({ credential, me }) {
             return null;
           });
 
-        const destroyInputSources = inputs => {
-          const destroyRequests = [];
-          Object.values(inputSourceMap).forEach(inputSource => {
+        const destroyInputSources = () =>
+          Object.values(inputSourceMap).map(inputSource => {
             const { id, input_field_name } = inputSource;
             if (!inputs[input_field_name]?.credential) {
-              destroyRequests.push(CredentialInputSourcesAPI.destroy(id));
+              return CredentialInputSourcesAPI.destroy(id);
             }
+            return null;
           });
-          return destroyRequests;
-        };
 
-        const { inputs, organization, ...remainingValues } = values;
-        const nonPluginInputs = {};
-        const pluginInputs = {};
-        Object.entries(inputs).forEach(([key, value]) => {
-          if (value.credential && value.inputs) {
-            pluginInputs[key] = value;
-          } else {
-            nonPluginInputs[key] = value;
-          }
-        });
         const [{ data }] = await Promise.all([
           CredentialsAPI.update(credential.id, {
             user: (me && me.id) || null,
@@ -74,12 +87,14 @@ function CredentialEdit({ credential, me }) {
             inputs: nonPluginInputs,
             ...remainingValues,
           }),
-          ...destroyInputSources(inputs),
+          ...destroyInputSources(),
         ]);
-        await Promise.all(createAndUpdateInputSources(pluginInputs));
+
+        await Promise.all(createAndUpdateInputSources());
+
         return data;
       },
-      [credential.id, me]
+      [me, credential.id]
     )
   );
 
@@ -100,12 +115,15 @@ function CredentialEdit({ credential, me }) {
             data: { results: loadedInputSources },
           },
         ] = await Promise.all([
-          CredentialTypesAPI.read({
-            or__namespace: ['gce', 'scm', 'ssh'],
-          }),
+          CredentialTypesAPI.read(),
           CredentialsAPI.readInputSources(credential.id, { page_size: 200 }),
         ]);
-        setCredentialTypes(loadedCredentialTypes);
+        setCredentialTypes(
+          loadedCredentialTypes.reduce((credentialTypesMap, credentialType) => {
+            credentialTypesMap[credentialType.id] = credentialType;
+            return credentialTypesMap;
+          }, {})
+        );
         setInputSources(
           loadedInputSources.reduce((inputSourcesMap, inputSource) => {
             inputSourcesMap[inputSource.input_field_name] = inputSource;
@@ -127,7 +145,7 @@ function CredentialEdit({ credential, me }) {
   };
 
   const handleSubmit = async values => {
-    await submitRequest(values, inputSources);
+    await submitRequest(values, credentialTypes, inputSources);
   };
 
   if (error) {
diff --git a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.test.jsx b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.test.jsx
index 3d4ce756cb..daa772cd3b 100644
--- a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.test.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.test.jsx
@@ -5,9 +5,12 @@ import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
-import { sleep } from '../../../../testUtils/testUtils';
 
-import { CredentialsAPI, CredentialTypesAPI } from '../../../api';
+import {
+  CredentialsAPI,
+  CredentialInputSourcesAPI,
+  CredentialTypesAPI,
+} from '../../../api';
 import CredentialEdit from './CredentialEdit';
 
 jest.mock('../../../api');
@@ -108,58 +111,6 @@ const mockCredential = {
 CredentialTypesAPI.read.mockResolvedValue({
   data: {
     results: [
-      {
-        id: 2,
-        type: 'credential_type',
-        url: '/api/v2/credential_types/2/',
-        related: {
-          credentials: '/api/v2/credential_types/2/credentials/',
-          activity_stream: '/api/v2/credential_types/2/activity_stream/',
-        },
-        summary_fields: {
-          user_capabilities: {
-            edit: false,
-            delete: false,
-          },
-        },
-        created: '2020-02-12T19:42:43.551238Z',
-        modified: '2020-02-12T19:43:03.164800Z',
-        name: 'Source Control',
-        description: '',
-        kind: 'scm',
-        namespace: 'scm',
-        managed_by_tower: true,
-        inputs: {
-          fields: [
-            {
-              id: 'username',
-              label: 'Username',
-              type: 'string',
-            },
-            {
-              id: 'password',
-              label: 'Password',
-              type: 'string',
-              secret: true,
-            },
-            {
-              id: 'ssh_key_data',
-              label: 'Source Control Private Key',
-              type: 'string',
-              format: 'ssh_private_key',
-              secret: true,
-              multiline: true,
-            },
-            {
-              id: 'ssh_key_unlock',
-              label: 'Private Key Passphrase',
-              type: 'string',
-              secret: true,
-            },
-          ],
-        },
-        injectors: {},
-      },
       {
         id: 1,
         type: 'credential_type',
@@ -245,58 +196,173 @@ CredentialTypesAPI.read.mockResolvedValue({
 });
 
 CredentialsAPI.update.mockResolvedValue({ data: { id: 3 } });
-CredentialsAPI.readInputSources.mockResolvedValue({ data: { results: [] } });
+CredentialsAPI.readInputSources.mockResolvedValue({
+  data: {
+    results: [
+      {
+        id: 34,
+        summary_fields: {
+          source_credential: {
+            id: 20,
+            name: 'CyberArk Conjur Secret Lookup',
+            description: '',
+            kind: 'conjur',
+            cloud: false,
+            credential_type_id: 20,
+          },
+        },
+        input_field_name: 'password',
+        metadata: {
+          secret_path: 'a',
+          secret_version: 'b',
+        },
+        source_credential: 20,
+      },
+      {
+        id: 35,
+        summary_fields: {
+          source_credential: {
+            id: 20,
+            name: 'CyberArk Conjur Secret Lookup',
+            description: '',
+            kind: 'conjur',
+            cloud: false,
+            credential_type_id: 20,
+          },
+        },
+        input_field_name: 'become_username',
+        metadata: {
+          secret_path: 'foo',
+          secret_version: 'bar',
+        },
+        source_credential: 20,
+      },
+    ],
+  },
+});
 
 describe('<CredentialEdit />', () => {
   let wrapper;
   let history;
 
-  beforeEach(async () => {
-    history = createMemoryHistory({ initialEntries: ['/credentials'] });
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <CredentialEdit credential={mockCredential} />,
-        {
-          context: { router: { history } },
-        }
-      );
+  describe('Initial GET request succeeds', () => {
+    beforeEach(async () => {
+      history = createMemoryHistory({ initialEntries: ['/credentials'] });
+      await act(async () => {
+        wrapper = mountWithContexts(
+          <CredentialEdit credential={mockCredential} />,
+          {
+            context: { router: { history } },
+          }
+        );
+      });
+    });
+
+    afterEach(() => {
+      wrapper.unmount();
+    });
+
+    test('initially renders successfully', async () => {
+      expect(wrapper.find('CredentialEdit').length).toBe(1);
+    });
+
+    test('handleCancel returns the user to credential detail', async () => {
+      await waitForElement(wrapper, 'isLoading', el => el.length === 0);
+      wrapper.find('Button[aria-label="Cancel"]').simulate('click');
+      expect(history.location.pathname).toEqual('/credentials/3/details');
+    });
+
+    test('handleSubmit should post to the api', async () => {
+      await waitForElement(wrapper, 'isLoading', el => el.length === 0);
+      await act(async () => {
+        wrapper.find('CredentialForm').prop('onSubmit')({
+          user: 1,
+          organization: null,
+          name: 'foo',
+          description: 'bar',
+          credential_type: '1',
+          inputs: {
+            username: {
+              credential: {
+                id: 1,
+                name: 'Some cred',
+              },
+              inputs: {
+                foo: 'bar',
+              },
+            },
+            password: 'foo',
+            ssh_key_data: 'bar',
+            ssh_public_key_data: 'baz',
+            ssh_key_unlock: 'foobar',
+            become_method: '',
+            become_username: {
+              credential: {
+                id: 1,
+                name: 'Some cred',
+              },
+              inputs: {
+                secret_path: '/foo/bar',
+                secret_version: '9000',
+              },
+              touched: true,
+            },
+            become_password: '',
+          },
+          passwordPrompts: {
+            become_password: true,
+          },
+        });
+      });
+      expect(CredentialsAPI.update).toHaveBeenCalledWith(3, {
+        user: 1,
+        organization: null,
+        name: 'foo',
+        description: 'bar',
+        credential_type: '1',
+        inputs: {
+          password: 'foo',
+          ssh_key_data: 'bar',
+          ssh_public_key_data: 'baz',
+          ssh_key_unlock: 'foobar',
+          become_method: '',
+          become_password: 'ASK',
+        },
+      });
+      expect(CredentialInputSourcesAPI.create).toHaveBeenCalledWith({
+        input_field_name: 'username',
+        metadata: {
+          foo: 'bar',
+        },
+        source_credential: 1,
+        target_credential: 3,
+      });
+      expect(CredentialInputSourcesAPI.update).toHaveBeenCalledWith(35, {
+        metadata: {
+          secret_path: '/foo/bar',
+          secret_version: '9000',
+        },
+        source_credential: 1,
+      });
+      expect(CredentialInputSourcesAPI.destroy).toHaveBeenCalledWith(34);
+      expect(history.location.pathname).toBe('/credentials/3/details');
     });
   });
-
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
-  test('initially renders successfully', async () => {
-    expect(wrapper.find('CredentialEdit').length).toBe(1);
-  });
-
-  test('handleCancel returns the user to credential detail', async () => {
-    await waitForElement(wrapper, 'isLoading', el => el.length === 0);
-    wrapper.find('Button[aria-label="Cancel"]').simulate('click');
-    expect(history.location.pathname).toEqual('/credentials/3/details');
-  });
-
-  test('handleSubmit should post to the api', async () => {
-    await waitForElement(wrapper, 'isLoading', el => el.length === 0);
-
-    wrapper.find('CredentialForm').prop('onSubmit')({
-      user: 1,
-      organization: null,
-      name: 'foo',
-      description: 'bar',
-      credential_type: '2',
-      inputs: {},
+  describe('Initial GET request fails', () => {
+    test('shows error when initial GET request fails', async () => {
+      CredentialTypesAPI.read.mockRejectedValue(new Error());
+      history = createMemoryHistory({ initialEntries: ['/credentials'] });
+      await act(async () => {
+        wrapper = mountWithContexts(
+          <CredentialEdit credential={mockCredential} />,
+          {
+            context: { router: { history } },
+          }
+        );
+      });
+      wrapper.update();
+      expect(wrapper.find('ContentError').length).toBe(1);
+      wrapper.unmount();
     });
-    await sleep(1);
-    expect(CredentialsAPI.update).toHaveBeenCalledWith(3, {
-      user: 1,
-      organization: null,
-      name: 'foo',
-      description: 'bar',
-      credential_type: '2',
-      inputs: {},
-    });
-    expect(history.location.pathname).toBe('/credentials/3/details');
   });
 });
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index ddd4ccaa5f..de814d2630 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -3,30 +3,20 @@ import { Formik, useField } from 'formik';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { arrayOf, func, object, shape } from 'prop-types';
-import { Form, FormGroup, Title } from '@patternfly/react-core';
+import { Form, FormGroup } from '@patternfly/react-core';
 import FormField, { FormSubmitError } from '../../../components/FormField';
 import FormActionGroup from '../../../components/FormActionGroup/FormActionGroup';
 import AnsibleSelect from '../../../components/AnsibleSelect';
 import { required } from '../../../util/validators';
 import OrganizationLookup from '../../../components/Lookup/OrganizationLookup';
-import {
-  FormColumnLayout,
-  SubFormLayout,
-} from '../../../components/FormLayout';
-import {
-  GoogleComputeEngineSubForm,
-  ManualSubForm,
-  SourceControlSubForm,
-} from './CredentialSubForms';
+import { FormColumnLayout } from '../../../components/FormLayout';
+import TypeInputsSubForm from './TypeInputsSubForm';
 
 function CredentialFormFields({
   i18n,
   credentialTypes,
   formik,
-  gceCredentialTypeId,
   initialValues,
-  scmCredentialTypeId,
-  sshCredentialTypeId,
 }) {
   const [orgField, orgMeta, orgHelpers] = useField('organization');
   const [credTypeField, credTypeMeta, credTypeHelpers] = useField({
@@ -34,23 +24,53 @@ function CredentialFormFields({
     validate: required(i18n._(t`Select a value for this field`), i18n),
   });
 
-  const credentialTypeOptions = Object.keys(credentialTypes).map(key => {
-    return {
-      value: credentialTypes[key].id,
-      key: credentialTypes[key].kind,
-      label: credentialTypes[key].name,
-    };
-  });
+  const credentialTypeOptions = Object.keys(credentialTypes)
+    .map(key => {
+      return {
+        value: credentialTypes[key].id,
+        key: credentialTypes[key].id,
+        label: credentialTypes[key].name,
+      };
+    })
+    .sort((a, b) => (a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1));
 
-  const resetSubFormFields = (value, form) => {
-    Object.keys(form.initialValues.inputs).forEach(label => {
-      if (parseInt(value, 10) === form.initialValues.credential_type) {
-        form.setFieldValue(`inputs.${label}`, initialValues.inputs[label]);
-      } else {
-        form.setFieldValue(`inputs.${label}`, '');
+  const resetSubFormFields = (newCredentialType, form) => {
+    const fields = credentialTypes[newCredentialType].inputs.fields || [];
+    fields.forEach(
+      ({ ask_at_runtime, type, id, choices, default: defaultValue }) => {
+        if (
+          parseInt(newCredentialType, 10) === form.initialValues.credential_type
+        ) {
+          form.setFieldValue(`inputs.${id}`, initialValues.inputs[id]);
+          if (ask_at_runtime) {
+            form.setFieldValue(
+              `passwordPrompts.${id}`,
+              initialValues.passwordPrompts[id]
+            );
+          }
+        } else {
+          switch (type) {
+            case 'string':
+              form.setFieldValue(`inputs.${id}`, defaultValue || '');
+              break;
+            case 'boolean':
+              form.setFieldValue(`inputs.${id}`, defaultValue || false);
+              break;
+            default:
+              break;
+          }
+
+          if (choices) {
+            form.setFieldValue(`inputs.${id}`, defaultValue);
+          }
+
+          if (ask_at_runtime) {
+            form.setFieldValue(`passwordPrompts.${id}`, false);
+          }
+        }
+        form.setFieldTouched(`inputs.${id}`, false);
       }
-      form.setFieldTouched(`inputs.${label}`, false);
-    });
+    );
   };
 
   return (
@@ -105,18 +125,13 @@ function CredentialFormFields({
           }}
         />
       </FormGroup>
-      {credTypeField.value !== undefined && credTypeField.value !== '' && (
-        <SubFormLayout>
-          <Title size="md">{i18n._(t`Type Details`)}</Title>
-          {
-            {
-              [gceCredentialTypeId]: <GoogleComputeEngineSubForm />,
-              [sshCredentialTypeId]: <ManualSubForm />,
-              [scmCredentialTypeId]: <SourceControlSubForm />,
-            }[credTypeField.value]
-          }
-        </SubFormLayout>
-      )}
+      {credTypeField.value !== undefined &&
+        credTypeField.value !== '' &&
+        credentialTypes[credTypeField.value]?.inputs?.fields && (
+          <TypeInputsSubForm
+            credentialType={credentialTypes[credTypeField.value]}
+          />
+        )}
     </>
   );
 }
@@ -135,19 +150,44 @@ function CredentialForm({
     description: credential.description || '',
     organization: credential?.summary_fields?.organization || null,
     credential_type: credential.credential_type || '',
-    inputs: {
-      become_method: credential?.inputs?.become_method || '',
-      become_password: credential?.inputs?.become_password || '',
-      become_username: credential?.inputs?.become_username || '',
-      password: credential?.inputs?.password || '',
-      project: credential?.inputs?.project || '',
-      ssh_key_data: credential?.inputs?.ssh_key_data || '',
-      ssh_key_unlock: credential?.inputs?.ssh_key_unlock || '',
-      ssh_public_key_data: credential?.inputs?.ssh_public_key_data || '',
-      username: credential?.inputs?.username || '',
-    },
+    inputs: {},
+    passwordPrompts: {},
   };
 
+  Object.values(credentialTypes).forEach(credentialType => {
+    const fields = credentialType.inputs.fields || [];
+    fields.forEach(
+      ({ ask_at_runtime, type, id, choices, default: defaultValue }) => {
+        if (credential?.inputs && credential.inputs[id]) {
+          if (ask_at_runtime) {
+            initialValues.passwordPrompts[id] =
+              credential.inputs[id] === 'ASK' || false;
+          }
+          initialValues.inputs[id] = credential.inputs[id];
+        } else {
+          switch (type) {
+            case 'string':
+              initialValues.inputs[id] = defaultValue || '';
+              break;
+            case 'boolean':
+              initialValues.inputs[id] = defaultValue || false;
+              break;
+            default:
+              break;
+          }
+
+          if (choices) {
+            initialValues.inputs[id] = defaultValue;
+          }
+
+          if (ask_at_runtime) {
+            initialValues.passwordPrompts[id] = false;
+          }
+        }
+      }
+    );
+  });
+
   Object.values(inputSources).forEach(inputSource => {
     initialValues.inputs[inputSource.input_field_name] = {
       credential: inputSource.summary_fields.source_credential,
@@ -155,60 +195,10 @@ function CredentialForm({
     };
   });
 
-  const scmCredentialTypeId = Object.keys(credentialTypes)
-    .filter(key => credentialTypes[key].namespace === 'scm')
-    .map(key => credentialTypes[key].id)[0];
-  const sshCredentialTypeId = Object.keys(credentialTypes)
-    .filter(key => credentialTypes[key].namespace === 'ssh')
-    .map(key => credentialTypes[key].id)[0];
-  const gceCredentialTypeId = Object.keys(credentialTypes)
-    .filter(key => credentialTypes[key].namespace === 'gce')
-    .map(key => credentialTypes[key].id)[0];
-
   return (
     <Formik
       initialValues={initialValues}
       onSubmit={values => {
-        const scmKeys = [
-          'username',
-          'password',
-          'ssh_key_data',
-          'ssh_key_unlock',
-        ];
-        const sshKeys = [
-          'username',
-          'password',
-          'ssh_key_data',
-          'ssh_public_key_data',
-          'ssh_key_unlock',
-          'become_method',
-          'become_username',
-          'become_password',
-        ];
-        const gceKeys = ['username', 'ssh_key_data', 'project'];
-        if (parseInt(values.credential_type, 10) === scmCredentialTypeId) {
-          Object.keys(values.inputs).forEach(key => {
-            if (scmKeys.indexOf(key) < 0) {
-              delete values.inputs[key];
-            }
-          });
-        } else if (
-          parseInt(values.credential_type, 10) === sshCredentialTypeId
-        ) {
-          Object.keys(values.inputs).forEach(key => {
-            if (sshKeys.indexOf(key) < 0) {
-              delete values.inputs[key];
-            }
-          });
-        } else if (
-          parseInt(values.credential_type, 10) === gceCredentialTypeId
-        ) {
-          Object.keys(values.inputs).forEach(key => {
-            if (gceKeys.indexOf(key) < 0) {
-              delete values.inputs[key];
-            }
-          });
-        }
         onSubmit(values);
       }}
     >
@@ -219,9 +209,6 @@ function CredentialForm({
               formik={formik}
               initialValues={initialValues}
               credentialTypes={credentialTypes}
-              gceCredentialTypeId={gceCredentialTypeId}
-              scmCredentialTypeId={scmCredentialTypeId}
-              sshCredentialTypeId={sshCredentialTypeId}
               {...rest}
             />
             <FormSubmitError error={submitError} />
@@ -239,13 +226,16 @@ function CredentialForm({
 CredentialForm.proptype = {
   handleSubmit: func.isRequired,
   handleCancel: func.isRequired,
+  credentialTypes: shape({}).isRequired,
   credential: shape({}),
   inputSources: arrayOf(object),
+  submitError: shape({}),
 };
 
 CredentialForm.defaultProps = {
   credential: {},
   inputSources: [],
+  submitError: null,
 };
 
 export default withI18n()(CredentialForm);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index c77089b758..2062ed01ee 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -4,11 +4,19 @@ import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 import machineCredential from './data.machineCredential.json';
 import gceCredential from './data.gceCredential.json';
 import scmCredential from './data.scmCredential.json';
-import credentialTypes from './data.credentialTypes.json';
+import credentialTypesArr from './data.credentialTypes.json';
 import CredentialForm from './CredentialForm';
 
 jest.mock('../../../api');
 
+const credentialTypes = credentialTypesArr.reduce(
+  (credentialTypesMap, credentialType) => {
+    credentialTypesMap[credentialType.id] = credentialType;
+    return credentialTypesMap;
+  },
+  {}
+);
+
 describe('<CredentialForm />', () => {
   let wrapper;
   const onCancel = jest.fn();
@@ -28,23 +36,19 @@ describe('<CredentialForm />', () => {
     expect(wrapper.find('FormGroup[label="Organization"]').length).toBe(1);
     expect(wrapper.find('FormGroup[label="Credential Type"]').length).toBe(1);
     expect(wrapper.find('FormGroup[label="Username"]').length).toBe(1);
-    expect(wrapper.find('FormGroup[label="Password"]').length).toBe(1);
+    expect(wrapper.find('input#credential-password').length).toBe(1);
     expect(wrapper.find('FormGroup[label="SSH Private Key"]').length).toBe(1);
     expect(
       wrapper.find('FormGroup[label="Signed SSH Certificate"]').length
     ).toBe(1);
+    expect(wrapper.find('input#credential-ssh_key_unlock').length).toBe(1);
     expect(
-      wrapper.find('FormGroup[label="Private Key Passphrase"]').length
-    ).toBe(1);
-    expect(
-      wrapper.find('FormGroup[label="Privelege Escalation Method"]').length
+      wrapper.find('FormGroup[label="Privilege Escalation Method"]').length
     ).toBe(1);
     expect(
       wrapper.find('FormGroup[label="Privilege Escalation Username"]').length
     ).toBe(1);
-    expect(
-      wrapper.find('FormGroup[label="Privilege Escalation Password"]').length
-    ).toBe(1);
+    expect(wrapper.find('input#credential-become_password').length).toBe(1);
   };
 
   const sourceFieldExpects = () => {
@@ -55,7 +59,7 @@ describe('<CredentialForm />', () => {
     expect(wrapper.find('FormGroup[label="Credential Type"]').length).toBe(1);
     expect(wrapper.find('FormGroup[label="Username"]').length).toBe(1);
     expect(wrapper.find('FormGroup[label="Password"]').length).toBe(1);
-    expect(wrapper.find('FormGroup[label="SSH Private Key"]').length).toBe(1);
+    expect(wrapper.find('FormGroup[label="SCM Private Key"]').length).toBe(1);
     expect(
       wrapper.find('FormGroup[label="Private Key Passphrase"]').length
     ).toBe(1);
@@ -71,10 +75,10 @@ describe('<CredentialForm />', () => {
       wrapper.find('FormGroup[label="Service account JSON file"]').length
     ).toBe(1);
     expect(
-      wrapper.find('FormGroup[label="Service account email address"]').length
+      wrapper.find('FormGroup[label="Service Account Email Address"]').length
     ).toBe(1);
     expect(wrapper.find('FormGroup[label="Project"]').length).toBe(1);
-    expect(wrapper.find('FormGroup[label="RSA private key"]').length).toBe(1);
+    expect(wrapper.find('FormGroup[label="RSA Private Key"]').length).toBe(1);
   };
 
   describe('Add', () => {
@@ -152,9 +156,9 @@ describe('<CredentialForm />', () => {
       gceFieldExpects();
       expect(wrapper.find('input#credential-username').prop('value')).toBe('');
       expect(wrapper.find('input#credential-project').prop('value')).toBe('');
-      expect(wrapper.find('textarea#credential-sshKeyData').prop('value')).toBe(
-        ''
-      );
+      expect(
+        wrapper.find('textarea#credential-ssh_key_data').prop('value')
+      ).toBe('');
       await act(async () => {
         wrapper.find('FileUpload').invoke('onChange')({
           name: 'foo.json',
@@ -169,7 +173,9 @@ describe('<CredentialForm />', () => {
       expect(wrapper.find('input#credential-project').prop('value')).toBe(
         'test123'
       );
-      expect(wrapper.find('textarea#credential-sshKeyData').prop('value')).toBe(
+      expect(
+        wrapper.find('textarea#credential-ssh_key_data').prop('value')
+      ).toBe(
         '-----BEGIN PRIVATE KEY-----\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n-----END PRIVATE KEY-----\n'
       );
     });
@@ -180,9 +186,9 @@ describe('<CredentialForm />', () => {
       wrapper.update();
       expect(wrapper.find('input#credential-username').prop('value')).toBe('');
       expect(wrapper.find('input#credential-project').prop('value')).toBe('');
-      expect(wrapper.find('textarea#credential-sshKeyData').prop('value')).toBe(
-        ''
-      );
+      expect(
+        wrapper.find('textarea#credential-ssh_key_data').prop('value')
+      ).toBe('');
     });
     test('should show error when error thrown parsing JSON', async () => {
       expect(wrapper.find('#credential-gce-file-helper').text()).toBe(
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx
new file mode 100644
index 0000000000..ee97e43d27
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx
@@ -0,0 +1,80 @@
+import React, { useState } from 'react';
+import { useField } from 'formik';
+import { bool, shape, string } from 'prop-types';
+import {
+  FormGroup,
+  Select,
+  SelectOption,
+  SelectVariant,
+} from '@patternfly/react-core';
+import { FieldTooltip } from '../../../../components/FormField';
+
+function BecomeMethodField({ fieldOptions, isRequired }) {
+  const [isOpen, setIsOpen] = useState(false);
+  const [options, setOptions] = useState(
+    [
+      'sudo',
+      'su',
+      'pbrun',
+      'pfexec',
+      'dzdo',
+      'pmrun',
+      'runas',
+      'enable',
+      'doas',
+      'ksu',
+      'machinectl',
+      'sesu',
+    ].map(val => ({ value: val }))
+  );
+  const [becomeMethodField, meta, helpers] = useField({
+    name: `inputs.${fieldOptions.id}`,
+  });
+  return (
+    <FormGroup
+      fieldId={`credential-${fieldOptions.id}`}
+      helperTextInvalid={meta.error}
+      label={fieldOptions.label}
+      isRequired={isRequired}
+      isValid={!(meta.touched && meta.error)}
+    >
+      {fieldOptions.help_text && (
+        <FieldTooltip content={fieldOptions.help_text} />
+      )}
+      <Select
+        maxHeight={200}
+        variant={SelectVariant.typeahead}
+        onToggle={setIsOpen}
+        onClear={() => {
+          helpers.setValue('');
+        }}
+        onSelect={(event, option) => {
+          helpers.setValue(option);
+          setIsOpen(false);
+        }}
+        isExpanded={isOpen}
+        selections={becomeMethodField.value}
+        isCreatable
+        onCreateOption={option => {
+          setOptions([...options, { value: option }]);
+        }}
+      >
+        {options.map(option => (
+          <SelectOption key={option.value} value={option.value} />
+        ))}
+      </Select>
+    </FormGroup>
+  );
+}
+BecomeMethodField.propTypes = {
+  fieldOptions: shape({
+    id: string.isRequired,
+    label: string.isRequired,
+  }).isRequired,
+  isRequired: bool,
+};
+BecomeMethodField.defaultProps = {
+  isRequired: false,
+};
+
+export default BecomeMethodField;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
new file mode 100644
index 0000000000..8adcf10190
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
@@ -0,0 +1,168 @@
+import React from 'react';
+import { useField, useFormikContext } from 'formik';
+import { shape, string } from 'prop-types';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import {
+  FormGroup,
+  InputGroup,
+  TextArea,
+  TextInput,
+} from '@patternfly/react-core';
+import { FieldTooltip, PasswordInput } from '../../../../components/FormField';
+import AnsibleSelect from '../../../../components/AnsibleSelect';
+import { CredentialType } from '../../../../types';
+import { required } from '../../../../util/validators';
+import { CredentialPluginField } from './CredentialPlugins';
+import BecomeMethodField from './BecomeMethodField';
+
+function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
+  const [subFormField, meta] = useField(`inputs.${fieldOptions.id}`);
+  const isValid = !(meta.touched && meta.error);
+  if (fieldOptions.multiline) {
+    return (
+      <TextArea
+        {...subFormField}
+        id={`credential-${fieldOptions.id}`}
+        rows={6}
+        resizeOrientation="vertical"
+        onChange={(value, event) => {
+          subFormField.onChange(event);
+        }}
+        isValid={isValid}
+      />
+    );
+  }
+  if (fieldOptions.secret) {
+    const passwordInput = () => (
+      <PasswordInput
+        {...subFormField}
+        id={`credential-${fieldOptions.id}`}
+        isValid={isValid}
+        {...rest}
+      />
+    );
+    return credentialKind === 'external' ? (
+      <InputGroup>{passwordInput()}</InputGroup>
+    ) : (
+      passwordInput()
+    );
+  }
+  return (
+    <TextInput
+      {...subFormField}
+      id={`credential-${fieldOptions.id}`}
+      onChange={(value, event) => {
+        subFormField.onChange(event);
+      }}
+      isValid={isValid}
+    />
+  );
+}
+
+CredentialInput.propTypes = {
+  fieldOptions: shape({
+    id: string.isRequired,
+    label: string.isRequired,
+  }).isRequired,
+  credentialKind: string,
+};
+
+CredentialInput.defaultProps = {
+  credentialKind: '',
+};
+
+function CredentialField({ credentialType, fieldOptions, i18n }) {
+  const { values: formikValues } = useFormikContext();
+  const requiredFields = credentialType?.inputs?.required || [];
+  const isRequired = requiredFields.includes(fieldOptions.id);
+  const validateField = () => {
+    if (isRequired && !formikValues?.passwordPrompts[fieldOptions.id]) {
+      const validationMsg = fieldOptions.ask_at_runtime
+        ? i18n._(
+            t`Provide a value for this field or select the Prompt on launch option.`
+          )
+        : null;
+      return required(validationMsg, i18n);
+    }
+    return null;
+  };
+  const [subFormField, meta, helpers] = useField({
+    name: `inputs.${fieldOptions.id}`,
+    validate: validateField(),
+  });
+  const isValid = !(meta.touched && meta.error);
+
+  if (fieldOptions.choices) {
+    const selectOptions = fieldOptions.choices.map(choice => {
+      return {
+        value: choice,
+        key: choice,
+        label: choice,
+      };
+    });
+    return (
+      <FormGroup
+        fieldId={`credential-${fieldOptions.id}`}
+        helperTextInvalid={meta.error}
+        label={fieldOptions.label}
+        isRequired={isRequired}
+        isValid={isValid}
+      >
+        <AnsibleSelect
+          {...subFormField}
+          id="credential_type"
+          data={selectOptions}
+          onChange={(event, value) => {
+            helpers.setValue(value);
+          }}
+        />
+      </FormGroup>
+    );
+  }
+  if (credentialType.kind === 'external') {
+    return (
+      <FormGroup
+        fieldId={`credential-${fieldOptions.id}`}
+        helperTextInvalid={meta.error}
+        label={fieldOptions.label}
+        isRequired={isRequired}
+        isValid={isValid}
+      >
+        {fieldOptions.help_text && (
+          <FieldTooltip content={fieldOptions.help_text} />
+        )}
+        <CredentialInput
+          credentialKind={credentialType.kind}
+          fieldOptions={fieldOptions}
+        />
+      </FormGroup>
+    );
+  }
+  if (credentialType.kind === 'ssh' && fieldOptions.id === 'become_method') {
+    return (
+      <BecomeMethodField fieldOptions={fieldOptions} isRequired={isRequired} />
+    );
+  }
+  return (
+    <CredentialPluginField
+      fieldOptions={fieldOptions}
+      isRequired={isRequired}
+      isValid={isValid}
+    >
+      <CredentialInput fieldOptions={fieldOptions} />
+    </CredentialPluginField>
+  );
+}
+
+CredentialField.propTypes = {
+  credentialType: CredentialType.isRequired,
+  fieldOptions: shape({
+    id: string.isRequired,
+    label: string.isRequired,
+  }).isRequired,
+};
+
+CredentialField.defaultProps = {};
+
+export default withI18n()(CredentialField);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx
new file mode 100644
index 0000000000..0df0ccc1d1
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx
@@ -0,0 +1,155 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import {
+  Button,
+  ButtonVariant,
+  FormGroup,
+  InputGroup,
+  Tooltip,
+} from '@patternfly/react-core';
+import { KeyIcon } from '@patternfly/react-icons';
+import { FieldTooltip } from '../../../../../components/FormField';
+import FieldWithPrompt from '../../../../../components/FieldWithPrompt';
+import { CredentialPluginPrompt } from './CredentialPluginPrompt';
+import CredentialPluginSelected from './CredentialPluginSelected';
+
+function CredentialPluginInput(props) {
+  const {
+    children,
+    i18n,
+    isDisabled,
+    isRequired,
+    isValid,
+    fieldOptions,
+  } = props;
+
+  const [showPluginWizard, setShowPluginWizard] = useState(false);
+  const [inputField, , helpers] = useField(`inputs.${fieldOptions.id}`);
+  const [passwordPromptField] = useField(`passwordPrompts.${fieldOptions.id}`);
+
+  return (
+    <>
+      {inputField?.value?.credential ? (
+        <CredentialPluginSelected
+          credential={inputField?.value?.credential}
+          onClearPlugin={() => helpers.setValue('')}
+          onEditPlugin={() => setShowPluginWizard(true)}
+        />
+      ) : (
+        <InputGroup>
+          {React.cloneElement(children, {
+            ...inputField,
+            isRequired,
+            isValid,
+            isDisabled: !!passwordPromptField.value,
+            onChange: (_, event) => {
+              inputField.onChange(event);
+            },
+          })}
+          <Tooltip
+            content={i18n._(
+              t`Populate field from an external secret management system`
+            )}
+          >
+            <Button
+              variant={ButtonVariant.control}
+              aria-label={i18n._(
+                t`Populate field from an external secret management system`
+              )}
+              onClick={() => setShowPluginWizard(true)}
+              isDisabled={isDisabled || !!passwordPromptField.value}
+            >
+              <KeyIcon />
+            </Button>
+          </Tooltip>
+        </InputGroup>
+      )}
+      {showPluginWizard && (
+        <CredentialPluginPrompt
+          initialValues={
+            typeof inputField.value === 'object' ? inputField.value : {}
+          }
+          onClose={() => setShowPluginWizard(false)}
+          onSubmit={val => {
+            val.touched = true;
+            helpers.setValue(val);
+            setShowPluginWizard(false);
+          }}
+        />
+      )}
+    </>
+  );
+}
+
+function CredentialPluginField(props) {
+  const { fieldOptions, isRequired, isValid } = props;
+
+  const [, meta, helpers] = useField(`inputs.${fieldOptions.id}`);
+  const [passwordPromptField] = useField(`passwordPrompts.${fieldOptions.id}`);
+
+  useEffect(() => {
+    if (passwordPromptField.value) {
+      helpers.setValue('');
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [passwordPromptField.value]);
+
+  return (
+    <>
+      {fieldOptions.ask_at_runtime ? (
+        <FieldWithPrompt
+          fieldId={`credential-${fieldOptions.id}`}
+          helperTextInvalid={meta.error}
+          isRequired={isRequired}
+          label={fieldOptions.label}
+          promptId={`credential-prompt-${fieldOptions.id}`}
+          promptName={`passwordPrompts.${fieldOptions.id}`}
+          tooltip={fieldOptions.help_text}
+        >
+          <CredentialPluginInput {...props} />
+          {meta.error && meta.touched && (
+            <div
+              className="pf-c-form__helper-text pf-m-error"
+              id={`${fieldOptions.id}-helper`}
+              aria-live="polite"
+            >
+              {meta.error}
+            </div>
+          )}
+        </FieldWithPrompt>
+      ) : (
+        <FormGroup
+          fieldId={`credential-${fieldOptions.id}`}
+          helperTextInvalid={meta.error}
+          isRequired={isRequired}
+          isValid={isValid}
+          label={fieldOptions.label}
+        >
+          {fieldOptions.help_text && (
+            <FieldTooltip content={fieldOptions.help_text} />
+          )}
+          <CredentialPluginInput {...props} />
+        </FormGroup>
+      )}
+    </>
+  );
+}
+
+CredentialPluginField.propTypes = {
+  fieldOptions: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    label: PropTypes.string.isRequired,
+  }).isRequired,
+  isDisabled: PropTypes.bool,
+  isRequired: PropTypes.bool,
+};
+
+CredentialPluginField.defaultProps = {
+  isDisabled: false,
+  isRequired: false,
+};
+
+export default withI18n()(CredentialPluginField);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.test.jsx
similarity index 85%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.test.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.test.jsx
index 39f77b63b4..a4bbc4fb74 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.test.jsx
@@ -1,9 +1,15 @@
 import React from 'react';
 import { Formik } from 'formik';
 import { TextInput } from '@patternfly/react-core';
-import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
+import { mountWithContexts } from '../../../../../../testUtils/enzymeHelpers';
 import CredentialPluginField from './CredentialPluginField';
 
+const fieldOptions = {
+  id: 'username',
+  label: 'Username',
+  type: 'string',
+};
+
 describe('<CredentialPluginField />', () => {
   let wrapper;
   describe('No plugin configured', () => {
@@ -18,9 +24,9 @@ describe('<CredentialPluginField />', () => {
         >
           {() => (
             <CredentialPluginField
-              id="credential-username"
-              name="inputs.username"
-              label="Username"
+              fieldOptions={fieldOptions}
+              isDisabled={false}
+              isRequired={false}
             >
               <TextInput id="credential-username" />
             </CredentialPluginField>
@@ -62,9 +68,9 @@ describe('<CredentialPluginField />', () => {
         >
           {() => (
             <CredentialPluginField
-              id="credential-username"
-              name="inputs.username"
-              label="Username"
+              fieldOptions={fieldOptions}
+              isDisabled={false}
+              isRequired={false}
             >
               <TextInput id="credential-username" />
             </CredentialPluginField>
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
similarity index 100%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
similarity index 94%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
index 2634301e07..93725cb3e8 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
@@ -3,15 +3,15 @@ import { act } from 'react-dom/test-utils';
 import {
   mountWithContexts,
   waitForElement,
-} from '../../../../../../testUtils/enzymeHelpers';
-import { CredentialsAPI, CredentialTypesAPI } from '../../../../../api';
-import selectedCredential from '../../data.cyberArkCredential.json';
-import azureVaultCredential from '../../data.azureVaultCredential.json';
-import hashiCorpCredential from '../../data.hashiCorpCredential.json';
+} from '../../../../../../../testUtils/enzymeHelpers';
+import { CredentialsAPI, CredentialTypesAPI } from '../../../../../../api';
+import selectedCredential from '../../../data.cyberArkCredential.json';
+import azureVaultCredential from '../../../data.azureVaultCredential.json';
+import hashiCorpCredential from '../../../data.hashiCorpCredential.json';
 import CredentialPluginPrompt from './CredentialPluginPrompt';
 
-jest.mock('../../../../../api/models/Credentials');
-jest.mock('../../../../../api/models/CredentialTypes');
+jest.mock('../../../../../../api/models/Credentials');
+jest.mock('../../../../../../api/models/CredentialTypes');
 
 CredentialsAPI.read.mockResolvedValue({
   data: {
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
similarity index 83%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
index a59f894470..8a04079b99 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
@@ -3,13 +3,13 @@ import { useHistory } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { useField } from 'formik';
-import { CredentialsAPI } from '../../../../../api';
-import CheckboxListItem from '../../../../../components/CheckboxListItem';
-import ContentError from '../../../../../components/ContentError';
-import DataListToolbar from '../../../../../components/DataListToolbar';
-import PaginatedDataList from '../../../../../components/PaginatedDataList';
-import { getQSConfig, parseQueryString } from '../../../../../util/qs';
-import useRequest from '../../../../../util/useRequest';
+import { CredentialsAPI } from '../../../../../../api';
+import CheckboxListItem from '../../../../../../components/CheckboxListItem';
+import ContentError from '../../../../../../components/ContentError';
+import DataListToolbar from '../../../../../../components/DataListToolbar';
+import PaginatedDataList from '../../../../../../components/PaginatedDataList';
+import { getQSConfig, parseQueryString } from '../../../../../../util/qs';
+import useRequest from '../../../../../../util/useRequest';
 
 const QS_CONFIG = getQSConfig('credential', {
   page: 1,
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
similarity index 89%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
index c612fc4fdb..69dd105a5c 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
@@ -5,14 +5,14 @@ import { useField, useFormikContext } from 'formik';
 import styled from 'styled-components';
 import { Button, Form, FormGroup, Tooltip } from '@patternfly/react-core';
 import { QuestionCircleIcon as PFQuestionCircleIcon } from '@patternfly/react-icons';
-import { CredentialTypesAPI } from '../../../../../api';
-import AnsibleSelect from '../../../../../components/AnsibleSelect';
-import ContentError from '../../../../../components/ContentError';
-import ContentLoading from '../../../../../components/ContentLoading';
-import FormField from '../../../../../components/FormField';
-import { FormFullWidthLayout } from '../../../../../components/FormLayout';
-import useRequest from '../../../../../util/useRequest';
-import { required } from '../../../../../util/validators';
+import { CredentialTypesAPI } from '../../../../../../api';
+import AnsibleSelect from '../../../../../../components/AnsibleSelect';
+import ContentError from '../../../../../../components/ContentError';
+import ContentLoading from '../../../../../../components/ContentLoading';
+import FormField from '../../../../../../components/FormField';
+import { FormFullWidthLayout } from '../../../../../../components/FormLayout';
+import useRequest from '../../../../../../util/useRequest';
+import { required } from '../../../../../../util/validators';
 
 const QuestionCircleIcon = styled(PFQuestionCircleIcon)`
   margin-left: 10px;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/index.js b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/index.js
similarity index 100%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/index.js
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/index.js
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.jsx
similarity index 93%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.jsx
index d97a7a39df..af5b228cf2 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.jsx
@@ -5,8 +5,8 @@ import { t, Trans } from '@lingui/macro';
 import styled from 'styled-components';
 import { Button, ButtonVariant, Tooltip } from '@patternfly/react-core';
 import { KeyIcon } from '@patternfly/react-icons';
-import CredentialChip from '../../../../components/CredentialChip';
-import { Credential } from '../../../../types';
+import CredentialChip from '../../../../../components/CredentialChip';
+import { Credential } from '../../../../../types';
 
 const SelectedCredential = styled.div`
   display: flex;
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.test.jsx
similarity index 87%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.test.jsx
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.test.jsx
index ce69724904..de17450c6d 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
-import selectedCredential from '../data.cyberArkCredential.json';
+import { mountWithContexts } from '../../../../../../testUtils/enzymeHelpers';
+import selectedCredential from '../../data.cyberArkCredential.json';
 import CredentialPluginSelected from './CredentialPluginSelected';
 
 describe('<CredentialPluginSelected />', () => {
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/index.js b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/index.js
similarity index 100%
rename from awx/ui_next/src/screens/Credential/shared/CredentialPlugins/index.js
rename to awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/index.js
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
new file mode 100644
index 0000000000..1332aa85c5
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
@@ -0,0 +1,89 @@
+import React, { useState } from 'react';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import { FileUpload, FormGroup } from '@patternfly/react-core';
+
+function GceFileUploadField({ i18n }) {
+  const [fileError, setFileError] = useState(null);
+  const [filename, setFilename] = useState('');
+  const [file, setFile] = useState('');
+  const [, , inputsUsernameHelpers] = useField({
+    name: 'inputs.username',
+  });
+  const [, , inputsProjectHelpers] = useField({
+    name: 'inputs.project',
+  });
+  const [, , inputsSSHKeyDataHelpers] = useField({
+    name: 'inputs.ssh_key_data',
+  });
+  return (
+    <FormGroup
+      fieldId="credential-gce-file"
+      isValid={!fileError}
+      label={i18n._(t`Service account JSON file`)}
+      helperText={i18n._(
+        t`Select a JSON formatted service account key to autopopulate the following fields.`
+      )}
+      helperTextInvalid={fileError}
+    >
+      <FileUpload
+        id="credential-gce-file"
+        value={file}
+        filename={filename}
+        filenamePlaceholder={i18n._(t`Choose a .json file`)}
+        onChange={async value => {
+          if (value) {
+            try {
+              setFile(value);
+              setFilename(value.name);
+              const fileText = await value.text();
+              const fileJSON = JSON.parse(fileText);
+              if (
+                !fileJSON.client_email &&
+                !fileJSON.project_id &&
+                !fileJSON.private_key
+              ) {
+                setFileError(
+                  i18n._(
+                    t`Expected at least one of client_email, project_id or private_key to be present in the file.`
+                  )
+                );
+              } else {
+                inputsUsernameHelpers.setValue(fileJSON.client_email || '');
+                inputsProjectHelpers.setValue(fileJSON.project_id || '');
+                inputsSSHKeyDataHelpers.setValue(fileJSON.private_key || '');
+                setFileError(null);
+              }
+            } catch {
+              setFileError(
+                i18n._(
+                  t`There was an error parsing the file. Please check the file formatting and try again.`
+                )
+              );
+            }
+          } else {
+            setFile('');
+            setFilename('');
+            inputsUsernameHelpers.setValue('');
+            inputsProjectHelpers.setValue('');
+            inputsSSHKeyDataHelpers.setValue('');
+            setFileError(null);
+          }
+        }}
+        dropzoneProps={{
+          accept: '.json',
+          onDropRejected: () => {
+            setFileError(
+              i18n._(
+                t`File upload rejected. Please select a single .json file.`
+              )
+            );
+          },
+        }}
+      />
+    </FormGroup>
+  );
+}
+
+export default withI18n()(GceFileUploadField);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/index.js b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/index.js
new file mode 100644
index 0000000000..d5d1e2f12a
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/index.js
@@ -0,0 +1,3 @@
+export { default as BecomeMethodField } from './BecomeMethodField';
+export { default as CredentialField } from './CredentialField';
+export { default as GceFileUploadField } from './GceFileUploadField';
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
deleted file mode 100644
index 77cc11ceb9..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { withI18n } from '@lingui/react';
-import { t } from '@lingui/macro';
-import { useField } from 'formik';
-import {
-  Button,
-  ButtonVariant,
-  FormGroup,
-  InputGroup,
-  Tooltip,
-} from '@patternfly/react-core';
-import { KeyIcon } from '@patternfly/react-icons';
-import { CredentialPluginPrompt } from './CredentialPluginPrompt';
-import CredentialPluginSelected from './CredentialPluginSelected';
-
-function CredentialPluginField(props) {
-  const {
-    children,
-    id,
-    name,
-    label,
-    validate,
-    isRequired,
-    isDisabled,
-    i18n,
-  } = props;
-  const [showPluginWizard, setShowPluginWizard] = useState(false);
-  const [field, meta, helpers] = useField({ name, validate });
-  const isValid = !(meta.touched && meta.error);
-
-  return (
-    <FormGroup
-      fieldId={id}
-      helperTextInvalid={meta.error}
-      isRequired={isRequired}
-      isValid={isValid}
-      label={label}
-    >
-      {field?.value?.credential ? (
-        <CredentialPluginSelected
-          credential={field?.value?.credential}
-          onClearPlugin={() => helpers.setValue('')}
-          onEditPlugin={() => setShowPluginWizard(true)}
-        />
-      ) : (
-        <InputGroup>
-          {React.cloneElement(children, {
-            ...field,
-            isRequired,
-            onChange: (_, event) => {
-              field.onChange(event);
-            },
-          })}
-          <Tooltip
-            content={i18n._(
-              t`Populate field from an external secret management system`
-            )}
-          >
-            <Button
-              variant={ButtonVariant.control}
-              aria-label={i18n._(
-                t`Populate field from an external secret management system`
-              )}
-              onClick={() => setShowPluginWizard(true)}
-              isDisabled={isDisabled}
-            >
-              <KeyIcon />
-            </Button>
-          </Tooltip>
-        </InputGroup>
-      )}
-      {showPluginWizard && (
-        <CredentialPluginPrompt
-          initialValues={typeof field.value === 'object' ? field.value : {}}
-          onClose={() => setShowPluginWizard(false)}
-          onSubmit={val => {
-            val.touched = true;
-            helpers.setValue(val);
-            setShowPluginWizard(false);
-          }}
-        />
-      )}
-    </FormGroup>
-  );
-}
-
-CredentialPluginField.propTypes = {
-  id: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
-  validate: PropTypes.func,
-  isRequired: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-};
-
-CredentialPluginField.defaultProps = {
-  validate: () => {},
-  isRequired: false,
-  isDisabled: false,
-};
-
-export default withI18n()(CredentialPluginField);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx
deleted file mode 100644
index 2622106afb..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import React, { useState } from 'react';
-import { withI18n } from '@lingui/react';
-import { t } from '@lingui/macro';
-import { useField } from 'formik';
-import {
-  FileUpload,
-  FormGroup,
-  TextArea,
-  TextInput,
-} from '@patternfly/react-core';
-import {
-  FormColumnLayout,
-  FormFullWidthLayout,
-} from '../../../../components/FormLayout';
-import { required } from '../../../../util/validators';
-import { CredentialPluginField } from '../CredentialPlugins';
-
-const GoogleComputeEngineSubForm = ({ i18n }) => {
-  const [fileError, setFileError] = useState(null);
-  const [filename, setFilename] = useState('');
-  const [file, setFile] = useState('');
-  const inputsUsernameHelpers = useField({
-    name: 'inputs.username',
-  })[2];
-  const inputsProjectHelpers = useField({
-    name: 'inputs.project',
-  })[2];
-  const inputsSSHKeyDataHelpers = useField({
-    name: 'inputs.ssh_key_data',
-  })[2];
-
-  return (
-    <FormColumnLayout>
-      <FormGroup
-        fieldId="credential-gce-file"
-        isValid={!fileError}
-        label={i18n._(t`Service account JSON file`)}
-        helperText={i18n._(
-          t`Select a JSON formatted service account key to autopopulate the following fields.`
-        )}
-        helperTextInvalid={fileError}
-      >
-        <FileUpload
-          id="credential-gce-file"
-          value={file}
-          filename={filename}
-          filenamePlaceholder={i18n._(t`Choose a .json file`)}
-          onChange={async value => {
-            if (value) {
-              try {
-                setFile(value);
-                setFilename(value.name);
-                const fileText = await value.text();
-                const fileJSON = JSON.parse(fileText);
-                if (
-                  !fileJSON.client_email &&
-                  !fileJSON.project_id &&
-                  !fileJSON.private_key
-                ) {
-                  setFileError(
-                    i18n._(
-                      t`Expected at least one of client_email, project_id or private_key to be present in the file.`
-                    )
-                  );
-                } else {
-                  inputsUsernameHelpers.setValue(fileJSON.client_email || '');
-                  inputsProjectHelpers.setValue(fileJSON.project_id || '');
-                  inputsSSHKeyDataHelpers.setValue(fileJSON.private_key || '');
-                  setFileError(null);
-                }
-              } catch {
-                setFileError(
-                  i18n._(
-                    t`There was an error parsing the file. Please check the file formatting and try again.`
-                  )
-                );
-              }
-            } else {
-              setFile('');
-              setFilename('');
-              inputsUsernameHelpers.setValue('');
-              inputsProjectHelpers.setValue('');
-              inputsSSHKeyDataHelpers.setValue('');
-              setFileError(null);
-            }
-          }}
-          dropzoneProps={{
-            accept: '.json',
-            onDropRejected: () => {
-              setFileError(
-                i18n._(
-                  t`File upload rejected. Please select a single .json file.`
-                )
-              );
-            },
-          }}
-        />
-      </FormGroup>
-      <CredentialPluginField
-        id="credential-username"
-        label={i18n._(t`Service account email address`)}
-        name="inputs.username"
-        type="email"
-        validate={required(null, i18n)}
-        isRequired
-      >
-        <TextInput id="credential-username" />
-      </CredentialPluginField>
-      <CredentialPluginField
-        id="credential-project"
-        label={i18n._(t`Project`)}
-        name="inputs.project"
-      >
-        <TextInput id="credential-project" />
-      </CredentialPluginField>
-      <FormFullWidthLayout>
-        <CredentialPluginField
-          id="credential-sshKeyData"
-          label={i18n._(t`RSA private key`)}
-          name="inputs.ssh_key_data"
-          type="textarea"
-          validate={required(null, i18n)}
-          isRequired
-        >
-          <TextArea
-            id="credential-sshKeyData"
-            rows={6}
-            resizeOrientation="vertical"
-          />
-        </CredentialPluginField>
-      </FormFullWidthLayout>
-    </FormColumnLayout>
-  );
-};
-
-export default withI18n()(GoogleComputeEngineSubForm);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/ManualSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/ManualSubForm.jsx
deleted file mode 100644
index 49517353f4..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/ManualSubForm.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import { useField } from 'formik';
-import { withI18n } from '@lingui/react';
-import { t } from '@lingui/macro';
-import { FormGroup } from '@patternfly/react-core';
-import FormField, { PasswordField } from '../../../../components/FormField';
-import AnsibleSelect from '../../../../components/AnsibleSelect';
-import {
-  FormColumnLayout,
-  FormFullWidthLayout,
-} from '../../../../components/FormLayout';
-import {
-  UsernameFormField,
-  PasswordFormField,
-  SSHKeyUnlockField,
-  SSHKeyDataField,
-} from './SharedFields';
-
-const ManualSubForm = ({ i18n }) => {
-  const becomeMethodOptions = [
-    {
-      value: '',
-      key: '',
-      label: i18n._(t`Choose a Privelege Escalation Method`),
-      isDisabled: true,
-    },
-    ...[
-      'sudo',
-      'su',
-      'pbrun',
-      'pfexec',
-      'dzdo',
-      'pmrun',
-      'runas',
-      'enable',
-      'doas',
-      'ksu',
-      'machinectl',
-      'sesu',
-    ].map(val => ({ value: val, key: val, label: val })),
-  ];
-
-  const becomeMethodFieldArr = useField('inputs.become_method');
-  const becomeMethodField = becomeMethodFieldArr[0];
-  const becomeMethodHelpers = becomeMethodFieldArr[2];
-
-  return (
-    <FormColumnLayout>
-      <UsernameFormField />
-      <PasswordFormField />
-      <FormFullWidthLayout>
-        <SSHKeyDataField />
-        <FormField
-          id="credential-sshPublicKeyData"
-          label={i18n._(t`Signed SSH Certificate`)}
-          name="inputs.ssh_public_key_data"
-          type="textarea"
-        />
-      </FormFullWidthLayout>
-      <SSHKeyUnlockField />
-      <FormGroup
-        fieldId="credential-becomeMethod"
-        label={i18n._(t`Privelege Escalation Method`)}
-      >
-        <AnsibleSelect
-          {...becomeMethodField}
-          id="credential-becomeMethod"
-          data={becomeMethodOptions}
-          onChange={(event, value) => {
-            becomeMethodHelpers.setValue(value);
-          }}
-        />
-      </FormGroup>
-      <FormField
-        id="credential-becomeUsername"
-        label={i18n._(t`Privilege Escalation Username`)}
-        name="inputs.become_username"
-        type="text"
-      />
-      <PasswordField
-        id="credential-becomePassword"
-        label={i18n._(t`Privilege Escalation Password`)}
-        name="inputs.become_password"
-      />
-    </FormColumnLayout>
-  );
-};
-
-export default withI18n()(ManualSubForm);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SharedFields.jsx
deleted file mode 100644
index d2d4ee20fc..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SharedFields.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-import { withI18n } from '@lingui/react';
-import { t } from '@lingui/macro';
-import { TextArea, TextInput } from '@patternfly/react-core';
-import { CredentialPluginField } from '../CredentialPlugins';
-import { PasswordInput } from '../../../../components/FormField';
-
-export const UsernameFormField = withI18n()(({ i18n }) => (
-  <CredentialPluginField
-    id="credential-username"
-    label={i18n._(t`Username`)}
-    name="inputs.username"
-  >
-    <TextInput id="credential-username" />
-  </CredentialPluginField>
-));
-
-export const PasswordFormField = withI18n()(({ i18n }) => (
-  <CredentialPluginField
-    id="credential-password"
-    label={i18n._(t`Password`)}
-    name="inputs.password"
-  >
-    <PasswordInput id="credential-password" />
-  </CredentialPluginField>
-));
-
-export const SSHKeyDataField = withI18n()(({ i18n }) => (
-  <CredentialPluginField
-    id="credential-sshKeyData"
-    label={i18n._(t`SSH Private Key`)}
-    name="inputs.ssh_key_data"
-  >
-    <TextArea
-      id="credential-sshKeyData"
-      rows={6}
-      resizeOrientation="vertical"
-    />
-  </CredentialPluginField>
-));
-
-export const SSHKeyUnlockField = withI18n()(({ i18n }) => (
-  <CredentialPluginField
-    id="credential-sshKeyUnlock"
-    label={i18n._(t`Private Key Passphrase`)}
-    name="inputs.ssh_key_unlock"
-  >
-    <PasswordInput id="credential-password" />
-  </CredentialPluginField>
-));
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SourceControlSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SourceControlSubForm.jsx
deleted file mode 100644
index 49bdc9fcfc..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/SourceControlSubForm.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import { withI18n } from '@lingui/react';
-import {
-  FormColumnLayout,
-  FormFullWidthLayout,
-} from '../../../../components/FormLayout';
-import {
-  UsernameFormField,
-  PasswordFormField,
-  SSHKeyUnlockField,
-  SSHKeyDataField,
-} from './SharedFields';
-
-const SourceControlSubForm = () => (
-  <FormColumnLayout>
-    <UsernameFormField />
-    <PasswordFormField />
-    <SSHKeyUnlockField />
-    <FormFullWidthLayout>
-      <SSHKeyDataField />
-    </FormFullWidthLayout>
-  </FormColumnLayout>
-);
-
-export default withI18n()(SourceControlSubForm);
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/index.js b/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/index.js
deleted file mode 100644
index fcd719a65d..0000000000
--- a/awx/ui_next/src/screens/Credential/shared/CredentialSubForms/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as GoogleComputeEngineSubForm } from './GoogleComputeEngineSubForm';
-export { default as ManualSubForm } from './ManualSubForm';
-export { default as SourceControlSubForm } from './SourceControlSubForm';
diff --git a/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx
new file mode 100644
index 0000000000..d05e27d16e
--- /dev/null
+++ b/awx/ui_next/src/screens/Credential/shared/TypeInputsSubForm.jsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { FormGroup, Title } from '@patternfly/react-core';
+import {
+  FormCheckboxLayout,
+  FormColumnLayout,
+  FormFullWidthLayout,
+  SubFormLayout,
+} from '../../../components/FormLayout';
+import { CheckboxField } from '../../../components/FormField';
+import { CredentialType } from '../../../types';
+import { CredentialField, GceFileUploadField } from './CredentialFormFields';
+
+function TypeInputsSubForm({ credentialType, i18n }) {
+  const stringFields = credentialType.inputs.fields.filter(
+    fieldOptions => fieldOptions.type === 'string' || fieldOptions.choices
+  );
+  const booleanFields = credentialType.inputs.fields.filter(
+    fieldOptions => fieldOptions.type === 'boolean'
+  );
+  return (
+    <SubFormLayout>
+      <Title size="md">{i18n._(t`Type Details`)}</Title>
+      <FormColumnLayout>
+        {credentialType.namespace === 'gce' && <GceFileUploadField />}
+        {stringFields.map(fieldOptions =>
+          fieldOptions.multiline ? (
+            <FormFullWidthLayout key={fieldOptions.id}>
+              <CredentialField
+                credentialType={credentialType}
+                fieldOptions={fieldOptions}
+              />
+            </FormFullWidthLayout>
+          ) : (
+            <CredentialField
+              key={fieldOptions.id}
+              credentialType={credentialType}
+              fieldOptions={fieldOptions}
+            />
+          )
+        )}
+        {booleanFields.length > 0 && (
+          <FormFullWidthLayout>
+            <FormGroup
+              fieldId="credential-checkboxes"
+              label={i18n._(t`Options`)}
+            >
+              <FormCheckboxLayout>
+                {booleanFields.map(fieldOptions => (
+                  <CheckboxField
+                    id={`credential-${fieldOptions.id}`}
+                    key={fieldOptions.id}
+                    name={`inputs.${fieldOptions.id}`}
+                    label={fieldOptions.label}
+                    tooltip={fieldOptions.help_text}
+                  />
+                ))}
+              </FormCheckboxLayout>
+            </FormGroup>
+          </FormFullWidthLayout>
+        )}
+      </FormColumnLayout>
+    </SubFormLayout>
+  );
+}
+
+TypeInputsSubForm.propTypes = {
+  credentialType: CredentialType.isRequired,
+};
+
+TypeInputsSubForm.defaultProps = {};
+
+export default withI18n()(TypeInputsSubForm);
diff --git a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
index 75e1cf1481..91439a4e86 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
@@ -1,4 +1,1077 @@
 [
+  {
+    "id": 5,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/5/",
+    "related": {
+      "credentials": "/api/v2/credential_types/5/credentials/",
+      "activity_stream": "/api/v2/credential_types/5/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.160896Z",
+    "modified": "2020-05-18T21:54:05.348882Z",
+    "name": "Amazon Web Services",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "aws",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "username",
+          "label": "Access Key",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Secret Key",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "security_token",
+          "label": "STS Token",
+          "type": "string",
+          "secret": true,
+          "help_text": "Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users."
+        }
+      ],
+      "required": ["username", "password"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 16,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/16/",
+    "related": {
+      "credentials": "/api/v2/credential_types/16/credentials/",
+      "activity_stream": "/api/v2/credential_types/16/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.334813Z",
+    "modified": "2020-05-18T21:54:05.424087Z",
+    "name": "Ansible Tower",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "tower",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "Ansible Tower Hostname",
+          "type": "string",
+          "help_text": "The Ansible Tower base URL to authenticate with."
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "verify_ssl",
+          "label": "Verify SSL",
+          "type": "boolean",
+          "secret": false
+        }
+      ],
+      "required": ["host", "username", "password"]
+    },
+    "injectors": {
+      "env": {
+        "TOWER_HOST": "{{host}}",
+        "TOWER_USERNAME": "{{username}}",
+        "TOWER_PASSWORD": "{{password}}",
+        "TOWER_VERIFY_SSL": "{{verify_ssl}}"
+      }
+    }
+  },
+  {
+    "id": 10,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/10/",
+    "related": {
+      "credentials": "/api/v2/credential_types/10/credentials/",
+      "activity_stream": "/api/v2/credential_types/10/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.251095Z",
+    "modified": "2020-05-18T21:54:05.383305Z",
+    "name": "Google Compute Engine",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "gce",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "username",
+          "label": "Service Account Email Address",
+          "type": "string",
+          "help_text": "The email address assigned to the Google Compute Engine service account."
+        },
+        {
+          "id": "project",
+          "label": "Project",
+          "type": "string",
+          "help_text": "The Project ID is the GCE assigned identification. It is often constructed as three words or two words followed by a three-digit number. Examples: project-id-000 and another-project-id"
+        },
+        {
+          "id": "ssh_key_data",
+          "label": "RSA Private Key",
+          "type": "string",
+          "format": "ssh_private_key",
+          "secret": true,
+          "multiline": true,
+          "help_text": "Paste the contents of the PEM file associated with the service account email."
+        }
+      ],
+      "required": ["username", "ssh_key_data"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 11,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/11/",
+    "related": {
+      "credentials": "/api/v2/credential_types/11/credentials/",
+      "activity_stream": "/api/v2/credential_types/11/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.263250Z",
+    "modified": "2020-05-18T21:54:05.389597Z",
+    "name": "Microsoft Azure Resource Manager",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "azure_rm",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "subscription",
+          "label": "Subscription ID",
+          "type": "string",
+          "help_text": "Subscription ID is an Azure construct, which is mapped to a username."
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "client",
+          "label": "Client ID",
+          "type": "string"
+        },
+        {
+          "id": "secret",
+          "label": "Client Secret",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "tenant",
+          "label": "Tenant ID",
+          "type": "string"
+        },
+        {
+          "id": "cloud_environment",
+          "label": "Azure Cloud Environment",
+          "type": "string",
+          "help_text": "Environment variable AZURE_CLOUD_ENVIRONMENT when using Azure GovCloud or Azure stack."
+        }
+      ],
+      "required": ["subscription"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 6,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/6/",
+    "related": {
+      "credentials": "/api/v2/credential_types/6/credentials/",
+      "activity_stream": "/api/v2/credential_types/6/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.178681Z",
+    "modified": "2020-05-18T21:54:05.355877Z",
+    "name": "OpenStack",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "openstack",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password (API Key)",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "host",
+          "label": "Host (Authentication URL)",
+          "type": "string",
+          "help_text": "The host to authenticate with.  For example, https://openstack.business.com/v2.0/"
+        },
+        {
+          "id": "project",
+          "label": "Project (Tenant Name)",
+          "type": "string"
+        },
+        {
+          "id": "project_domain_name",
+          "label": "Project (Domain Name)",
+          "type": "string"
+        },
+        {
+          "id": "domain",
+          "label": "Domain Name",
+          "type": "string",
+          "help_text": "OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Refer to Ansible Tower documentation for common scenarios."
+        },
+        {
+          "id": "verify_ssl",
+          "label": "Verify SSL",
+          "type": "boolean",
+          "default": true
+        }
+      ],
+      "required": ["username", "password", "host", "project"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 9,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/9/",
+    "related": {
+      "credentials": "/api/v2/credential_types/9/credentials/",
+      "activity_stream": "/api/v2/credential_types/9/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.230367Z",
+    "modified": "2020-05-18T21:54:05.376824Z",
+    "name": "Red Hat CloudForms",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "cloudforms",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "CloudForms URL",
+          "type": "string",
+          "help_text": "Enter the URL for the virtual machine that corresponds to your CloudForms instance. For example, https://cloudforms.example.org"
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        }
+      ],
+      "required": ["host", "username", "password"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 8,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/8/",
+    "related": {
+      "credentials": "/api/v2/credential_types/8/credentials/",
+      "activity_stream": "/api/v2/credential_types/8/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.209086Z",
+    "modified": "2020-05-18T21:54:05.370135Z",
+    "name": "Red Hat Satellite 6",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "satellite6",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "Satellite 6 URL",
+          "type": "string",
+          "help_text": "Enter the URL that corresponds to your Red Hat Satellite 6 server. For example, https://satellite.example.org"
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        }
+      ],
+      "required": ["host", "username", "password"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 15,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/15/",
+    "related": {
+      "credentials": "/api/v2/credential_types/15/credentials/",
+      "activity_stream": "/api/v2/credential_types/15/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.320780Z",
+    "modified": "2020-05-18T21:54:05.415842Z",
+    "name": "Red Hat Virtualization",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "rhv",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "Host (Authentication URL)",
+          "type": "string",
+          "help_text": "The host to authenticate with."
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "ca_file",
+          "label": "CA File",
+          "type": "string",
+          "help_text": "Absolute file path to the CA file to use (optional)"
+        }
+      ],
+      "required": ["host", "username", "password"]
+    },
+    "injectors": {
+      "file": {
+        "template": "[ovirt]\novirt_url={{host}}\novirt_username={{username}}\novirt_password={{password}}\n{% if ca_file %}ovirt_ca_file={{ca_file}}{% endif %}"
+      },
+      "env": {
+        "OVIRT_INI_PATH": "{{tower.filename}}",
+        "OVIRT_URL": "{{host}}",
+        "OVIRT_USERNAME": "{{username}}",
+        "OVIRT_PASSWORD": "{{password}}"
+      }
+    }
+  },
+  {
+    "id": 7,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/7/",
+    "related": {
+      "credentials": "/api/v2/credential_types/7/credentials/",
+      "activity_stream": "/api/v2/credential_types/7/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.194625Z",
+    "modified": "2020-05-18T21:54:05.362610Z",
+    "name": "VMware vCenter",
+    "description": "",
+    "kind": "cloud",
+    "namespace": "vmware",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "VCenter Host",
+          "type": "string",
+          "help_text": "Enter the hostname or IP address that corresponds to your VMware vCenter."
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        }
+      ],
+      "required": ["host", "username", "password"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 18,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/18/",
+    "related": {
+      "credentials": "/api/v2/credential_types/18/credentials/",
+      "activity_stream": "/api/v2/credential_types/18/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.370730Z",
+    "modified": "2020-05-18T21:54:05.436400Z",
+    "name": "CyberArk AIM Central Credential Provider Lookup",
+    "description": "",
+    "kind": "external",
+    "namespace": "aim",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "url",
+          "label": "CyberArk AIM URL",
+          "type": "string",
+          "format": "url"
+        },
+        {
+          "id": "app_id",
+          "label": "Application ID",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "client_key",
+          "label": "Client Key",
+          "type": "string",
+          "secret": true,
+          "multiline": true
+        },
+        {
+          "id": "client_cert",
+          "label": "Client Certificate",
+          "type": "string",
+          "secret": true,
+          "multiline": true
+        },
+        {
+          "id": "verify",
+          "label": "Verify SSL Certificates",
+          "type": "boolean",
+          "default": true
+        }
+      ],
+      "metadata": [
+        {
+          "id": "object_query",
+          "label": "Object Query",
+          "type": "string",
+          "help_text": "Lookup query for the object. Ex: Safe=TestSafe;Object=testAccountName123"
+        },
+        {
+          "id": "object_query_format",
+          "label": "Object Query Format",
+          "type": "string",
+          "default": "Exact",
+          "choices": ["Exact", "Regexp"]
+        },
+        {
+          "id": "reason",
+          "label": "Reason",
+          "type": "string",
+          "help_text": "Object request reason. This is only needed if it is required by the object's policy."
+        }
+      ],
+      "required": ["url", "app_id", "object_query"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 20,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/20/",
+    "related": {
+      "credentials": "/api/v2/credential_types/20/credentials/",
+      "activity_stream": "/api/v2/credential_types/20/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.398260Z",
+    "modified": "2020-05-18T21:54:05.451444Z",
+    "name": "CyberArk Conjur Secret Lookup",
+    "description": "",
+    "kind": "external",
+    "namespace": "conjur",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "url",
+          "label": "Conjur URL",
+          "type": "string",
+          "format": "url"
+        },
+        {
+          "id": "api_key",
+          "label": "API Key",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "account",
+          "label": "Account",
+          "type": "string"
+        },
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "cacert",
+          "label": "Public Key Certificate",
+          "type": "string",
+          "multiline": true
+        }
+      ],
+      "metadata": [
+        {
+          "id": "secret_path",
+          "label": "Secret Identifier",
+          "type": "string",
+          "help_text": "The identifier for the secret e.g., /some/identifier"
+        },
+        {
+          "id": "secret_version",
+          "label": "Secret Version",
+          "type": "string",
+          "help_text": "Used to specify a specific secret version (if left empty, the latest version will be used)."
+        }
+      ],
+      "required": ["url", "api_key", "account", "username"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 21,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/21/",
+    "related": {
+      "credentials": "/api/v2/credential_types/21/credentials/",
+      "activity_stream": "/api/v2/credential_types/21/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.422968Z",
+    "modified": "2020-05-18T21:54:05.459711Z",
+    "name": "HashiCorp Vault Secret Lookup",
+    "description": "",
+    "kind": "external",
+    "namespace": "hashivault_kv",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "url",
+          "label": "Server URL",
+          "type": "string",
+          "format": "url",
+          "help_text": "The URL to the HashiCorp Vault"
+        },
+        {
+          "id": "token",
+          "label": "Token",
+          "type": "string",
+          "secret": true,
+          "help_text": "The access token used to authenticate to the Vault server"
+        },
+        {
+          "id": "cacert",
+          "label": "CA Certificate",
+          "type": "string",
+          "multiline": true,
+          "help_text": "The CA certificate used to verify the SSL certificate of the Vault server"
+        },
+        {
+          "id": "role_id",
+          "label": "AppRole role_id",
+          "type": "string",
+          "multiline": false,
+          "help_text": "The Role ID for AppRole Authentication"
+        },
+        {
+          "id": "secret_id",
+          "label": "AppRole secret_id",
+          "type": "string",
+          "multiline": false,
+          "secret": true,
+          "help_text": "The Secret ID for AppRole Authentication"
+        },
+        {
+          "id": "api_version",
+          "label": "API Version",
+          "choices": ["v1", "v2"],
+          "help_text": "API v1 is for static key/value lookups.  API v2 is for versioned key/value lookups.",
+          "default": "v1"
+        }
+      ],
+      "metadata": [
+        {
+          "id": "secret_backend",
+          "label": "Name of Secret Backend",
+          "type": "string",
+          "help_text": "The name of the kv secret backend (if left empty, the first segment of the secret path will be used)."
+        },
+        {
+          "id": "secret_path",
+          "label": "Path to Secret",
+          "type": "string",
+          "help_text": "The path to the secret stored in the secret backend e.g, /some/secret/"
+        },
+        {
+          "id": "auth_path",
+          "label": "Path to Auth",
+          "type": "string",
+          "help_text": "The path where the Authentication method is mounted e.g, approle"
+        },
+        {
+          "id": "secret_key",
+          "label": "Key Name",
+          "type": "string",
+          "help_text": "The name of the key to look up in the secret."
+        },
+        {
+          "id": "secret_version",
+          "label": "Secret Version (v2 only)",
+          "type": "string",
+          "help_text": "Used to specify a specific secret version (if left empty, the latest version will be used)."
+        }
+      ],
+      "required": ["url", "secret_path", "api_version", "secret_key"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 22,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/22/",
+    "related": {
+      "credentials": "/api/v2/credential_types/22/credentials/",
+      "activity_stream": "/api/v2/credential_types/22/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.437779Z",
+    "modified": "2020-05-18T21:54:05.472241Z",
+    "name": "HashiCorp Vault Signed SSH",
+    "description": "",
+    "kind": "external",
+    "namespace": "hashivault_ssh",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "url",
+          "label": "Server URL",
+          "type": "string",
+          "format": "url",
+          "help_text": "The URL to the HashiCorp Vault"
+        },
+        {
+          "id": "token",
+          "label": "Token",
+          "type": "string",
+          "secret": true,
+          "help_text": "The access token used to authenticate to the Vault server"
+        },
+        {
+          "id": "cacert",
+          "label": "CA Certificate",
+          "type": "string",
+          "multiline": true,
+          "help_text": "The CA certificate used to verify the SSL certificate of the Vault server"
+        },
+        {
+          "id": "role_id",
+          "label": "AppRole role_id",
+          "type": "string",
+          "multiline": false,
+          "help_text": "The Role ID for AppRole Authentication"
+        },
+        {
+          "id": "secret_id",
+          "label": "AppRole secret_id",
+          "type": "string",
+          "multiline": false,
+          "secret": true,
+          "help_text": "The Secret ID for AppRole Authentication"
+        }
+      ],
+      "metadata": [
+        {
+          "id": "public_key",
+          "label": "Unsigned Public Key",
+          "type": "string",
+          "multiline": true
+        },
+        {
+          "id": "secret_path",
+          "label": "Path to Secret",
+          "type": "string",
+          "help_text": "The path to the secret stored in the secret backend e.g, /some/secret/"
+        },
+        {
+          "id": "auth_path",
+          "label": "Path to Auth",
+          "type": "string",
+          "help_text": "The path where the Authentication method is mounted e.g, approle"
+        },
+        {
+          "id": "role",
+          "label": "Role Name",
+          "type": "string",
+          "help_text": "The name of the role used to sign."
+        },
+        {
+          "id": "valid_principals",
+          "label": "Valid Principals",
+          "type": "string",
+          "help_text": "Valid principals (either usernames or hostnames) that the certificate should be signed for."
+        }
+      ],
+      "required": ["url", "secret_path", "public_key", "role"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 19,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/19/",
+    "related": {
+      "credentials": "/api/v2/credential_types/19/credentials/",
+      "activity_stream": "/api/v2/credential_types/19/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.384608Z",
+    "modified": "2020-05-18T21:54:05.443806Z",
+    "name": "Microsoft Azure Key Vault",
+    "description": "",
+    "kind": "external",
+    "namespace": "azure_kv",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "url",
+          "label": "Vault URL (DNS Name)",
+          "type": "string",
+          "format": "url"
+        },
+        {
+          "id": "client",
+          "label": "Client ID",
+          "type": "string"
+        },
+        {
+          "id": "secret",
+          "label": "Client Secret",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "tenant",
+          "label": "Tenant ID",
+          "type": "string"
+        },
+        {
+          "id": "cloud_name",
+          "label": "Cloud Environment",
+          "help_text": "Specify which azure cloud environment to use.",
+          "choices": [
+            "AzureUSGovernment",
+            "AzureCloud",
+            "AzureChinaCloud",
+            "AzureGermanCloud"
+          ],
+          "default": "AzureCloud"
+        }
+      ],
+      "metadata": [
+        {
+          "id": "secret_field",
+          "label": "Secret Name",
+          "type": "string",
+          "help_text": "The name of the secret to look up."
+        },
+        {
+          "id": "secret_version",
+          "label": "Secret Version",
+          "type": "string",
+          "help_text": "Used to specify a specific secret version (if left empty, the latest version will be used)."
+        }
+      ],
+      "required": ["url", "client", "secret", "tenant", "secret_field"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 14,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/14/",
+    "related": {
+      "credentials": "/api/v2/credential_types/14/credentials/",
+      "activity_stream": "/api/v2/credential_types/14/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.306541Z",
+    "modified": "2020-05-18T21:54:05.409381Z",
+    "name": "Insights",
+    "description": "",
+    "kind": "insights",
+    "namespace": "insights",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        }
+      ],
+      "required": ["username", "password"]
+    },
+    "injectors": {
+      "extra_vars": {
+        "scm_username": "{{username}}",
+        "scm_password": "{{password}}"
+      }
+    }
+  },
+  {
+    "id": 17,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/17/",
+    "related": {
+      "credentials": "/api/v2/credential_types/17/credentials/",
+      "activity_stream": "/api/v2/credential_types/17/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.356431Z",
+    "modified": "2020-05-18T21:54:05.430264Z",
+    "name": "OpenShift or Kubernetes API Bearer Token",
+    "description": "",
+    "kind": "kubernetes",
+    "namespace": "kubernetes_bearer_token",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "host",
+          "label": "OpenShift or Kubernetes API Endpoint",
+          "type": "string",
+          "help_text": "The OpenShift or Kubernetes API Endpoint to authenticate with."
+        },
+        {
+          "id": "bearer_token",
+          "label": "API authentication bearer token",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "verify_ssl",
+          "label": "Verify SSL",
+          "type": "boolean",
+          "default": true
+        },
+        {
+          "id": "ssl_ca_cert",
+          "label": "Certificate Authority data",
+          "type": "string",
+          "secret": true,
+          "multiline": true
+        }
+      ],
+      "required": ["host", "bearer_token"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 4,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/4/",
+    "related": {
+      "credentials": "/api/v2/credential_types/4/credentials/",
+      "activity_stream": "/api/v2/credential_types/4/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.142889Z",
+    "modified": "2020-05-18T21:54:05.341825Z",
+    "name": "Network",
+    "description": "",
+    "kind": "net",
+    "namespace": "net",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "username",
+          "label": "Username",
+          "type": "string"
+        },
+        {
+          "id": "password",
+          "label": "Password",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "ssh_key_data",
+          "label": "SSH Private Key",
+          "type": "string",
+          "format": "ssh_private_key",
+          "secret": true,
+          "multiline": true
+        },
+        {
+          "id": "ssh_key_unlock",
+          "label": "Private Key Passphrase",
+          "type": "string",
+          "secret": true
+        },
+        {
+          "id": "authorize",
+          "label": "Authorize",
+          "type": "boolean"
+        },
+        {
+          "id": "authorize_password",
+          "label": "Authorize Password",
+          "type": "string",
+          "secret": true
+        }
+      ],
+      "dependencies": {
+        "authorize_password": ["authorize"]
+      },
+      "required": ["username"]
+    },
+    "injectors": {}
+  },
   {
     "id": 2,
     "type": "credential_type",
@@ -13,8 +1086,8 @@
         "delete": false
       }
     },
-    "created": "2020-02-12T19:42:43.551238Z",
-    "modified": "2020-02-12T19:43:03.164800Z",
+    "created": "2020-05-18T21:53:35.112580Z",
+    "modified": "2020-05-18T21:54:05.324947Z",
     "name": "Source Control",
     "description": "",
     "kind": "scm",
@@ -35,7 +1108,7 @@
         },
         {
           "id": "ssh_key_data",
-          "label": "Source Control Private Key",
+          "label": "SCM Private Key",
           "type": "string",
           "format": "ssh_private_key",
           "secret": true,
@@ -65,8 +1138,8 @@
         "delete": false
       }
     },
-    "created": "2020-02-12T19:42:43.539626Z",
-    "modified": "2020-02-12T19:43:03.159739Z",
+    "created": "2020-05-18T21:53:35.092707Z",
+    "modified": "2020-05-18T21:54:05.314415Z",
     "name": "Machine",
     "description": "",
     "kind": "ssh",
@@ -131,12 +1204,12 @@
     "injectors": {}
   },
   {
-    "id": 10,
+    "id": 12,
     "type": "credential_type",
-    "url": "/api/v2/credential_types/10/",
+    "url": "/api/v2/credential_types/12/",
     "related": {
-      "credentials": "/api/v2/credential_types/10/credentials/",
-      "activity_stream": "/api/v2/credential_types/10/activity_stream/"
+      "credentials": "/api/v2/credential_types/12/credentials/",
+      "activity_stream": "/api/v2/credential_types/12/activity_stream/"
     },
     "summary_fields": {
       "user_capabilities": {
@@ -144,38 +1217,101 @@
         "delete": false
       }
     },
-    "created": "2020-04-09T19:20:27.090665Z",
-    "modified": "2020-04-09T19:21:11.575214Z",
-    "name": "Google Compute Engine",
+    "created": "2020-05-18T21:53:35.276032Z",
+    "modified": "2020-05-18T21:54:05.395920Z",
+    "name": "GitHub Personal Access Token",
     "description": "",
-    "kind": "cloud",
-    "namespace": "gce",
+    "kind": "token",
+    "namespace": "github_token",
     "managed_by_tower": true,
     "inputs": {
       "fields": [
         {
-          "id": "username",
-          "label": "Service Account Email Address",
+          "id": "token",
+          "label": "Token",
           "type": "string",
-          "help_text": "The email address assigned to the Google Compute Engine service account."
-        },
-        {
-          "id": "project",
-          "label": "Project",
-          "type": "string",
-          "help_text": "The Project ID is the GCE assigned identification. It is often constructed as three words or two words followed by a three-digit number. Examples: project-id-000 and another-project-id"
-        },
-        {
-          "id": "ssh_key_data",
-          "label": "RSA Private Key",
-          "type": "string",
-          "format": "ssh_private_key",
           "secret": true,
-          "multiline": true,
-          "help_text": "Paste the contents of the PEM file associated with the service account email."
+          "help_text": "This token needs to come from your profile settings in GitHub"
         }
       ],
-      "required": ["username", "ssh_key_data"]
+      "required": ["token"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 13,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/13/",
+    "related": {
+      "credentials": "/api/v2/credential_types/13/credentials/",
+      "activity_stream": "/api/v2/credential_types/13/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.285972Z",
+    "modified": "2020-05-18T21:54:05.402347Z",
+    "name": "GitLab Personal Access Token",
+    "description": "",
+    "kind": "token",
+    "namespace": "gitlab_token",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "token",
+          "label": "Token",
+          "type": "string",
+          "secret": true,
+          "help_text": "This token needs to come from your profile settings in GitLab"
+        }
+      ],
+      "required": ["token"]
+    },
+    "injectors": {}
+  },
+  {
+    "id": 3,
+    "type": "credential_type",
+    "url": "/api/v2/credential_types/3/",
+    "related": {
+      "credentials": "/api/v2/credential_types/3/credentials/",
+      "activity_stream": "/api/v2/credential_types/3/activity_stream/"
+    },
+    "summary_fields": {
+      "user_capabilities": {
+        "edit": false,
+        "delete": false
+      }
+    },
+    "created": "2020-05-18T21:53:35.126565Z",
+    "modified": "2020-05-18T21:54:05.334941Z",
+    "name": "Vault",
+    "description": "",
+    "kind": "vault",
+    "namespace": "vault",
+    "managed_by_tower": true,
+    "inputs": {
+      "fields": [
+        {
+          "id": "vault_password",
+          "label": "Vault Password",
+          "type": "string",
+          "secret": true,
+          "ask_at_runtime": true
+        },
+        {
+          "id": "vault_id",
+          "label": "Vault Identifier",
+          "type": "string",
+          "format": "vault_id",
+          "help_text": "Specify an (optional) Vault ID. This is equivalent to specifying the --vault-id Ansible parameter for providing multiple Vault passwords.  Note: this feature only works in Ansible 2.4+."
+        }
+      ],
+      "required": ["vault_password"]
     },
     "injectors": {}
   }
diff --git a/awx/ui_next/src/types.js b/awx/ui_next/src/types.js
index 5e60df659a..46dd0298ea 100644
--- a/awx/ui_next/src/types.js
+++ b/awx/ui_next/src/types.js
@@ -336,3 +336,16 @@ export const Survey = shape({
   description: string,
   spec: arrayOf(SurveyQuestion),
 });
+
+export const CredentialType = shape({
+  id: number.isRequired,
+  type: string.isRequired,
+  url: string.isRequired,
+  related: shape({}),
+  summary_fields: shape({}),
+  name: string.isRequired,
+  description: string,
+  kind: string.isRequired,
+  namespace: string,
+  inputs: shape({}).isRequired,
+});