diff --git a/app/javascript/components/ansible-playbook-edit-catalog-form/helper.js b/app/javascript/components/ansible-playbook-edit-catalog-form/helper.js
index ff2b942633b..a7c2daf279f 100644
--- a/app/javascript/components/ansible-playbook-edit-catalog-form/helper.js
+++ b/app/javascript/components/ansible-playbook-edit-catalog-form/helper.js
@@ -1,7 +1,6 @@
 import { useFieldApi, useFormApi } from '@@ddf';
 import React from 'react';
-import { Button, TextInput, Checkbox } from 'carbon-components-react';
-import { TrashCan32 } from '@carbon/icons-react';
+import { Button, Checkbox } from 'carbon-components-react';
 import PropTypes from 'prop-types';
 import { TreeViewRedux } from '../tree-view';
 
@@ -153,64 +152,6 @@ TreeViewReduxWrapper.propTypes = {
   roleAllows: PropTypes.bool.isRequired,
 };
 
-/** component used as a mapper to include the key value pairs ofr extra vars */
-export const KeyValueListComponent = (props) => {
-  const {
-    input, label, keyLabel, valueLabel,
-  } = useFieldApi(props);
-  const formOptions = useFormApi();
-
-  const addPair = () => {
-    const newPairs = [...input.value, { key: '', value: '' }];
-    formOptions.change(input.name, newPairs);
-  };
-
-  const deletePair = (index) => {
-    const newPairs = [...input.value];
-    newPairs.splice(index, 1);
-    formOptions.change(input.name, newPairs);
-  };
-
-  const updatePair = (index, key, value) => {
-    const newPairs = [...input.value];
-    newPairs[index] = { key, value };
-    formOptions.change(input.name, newPairs);
-  };
-
-  return (
-    <div className="key-value-list-component-wrapper">
-      <label htmlFor={input.name} className="bx--label">{label}</label>
-      <br />
-      {input.value && input.value.map((pair, index) => (
-        // eslint-disable-next-line react/no-array-index-key
-        <div key={index} className="key-value-list-pair">
-          <TextInput
-            id={`${input.name}.${index}.key`}
-            labelText={keyLabel}
-            value={pair.key}
-            onChange={(event) => updatePair(index, event.target.value, pair.value)}
-          />
-          <TextInput
-            id={`${input.name}.${index}.value`}
-            labelText={valueLabel}
-            value={pair.value}
-            onChange={(event) => updatePair(index, pair.key, event.target.value)}
-          />
-          <Button
-            hasIconOnly
-            kind="danger"
-            className="key-value-delete"
-            renderIcon={TrashCan32}
-            iconDescription="Delete Key-Value Pair"
-            onClick={() => deletePair(index)}
-          />
-        </div>
-      ))}
-      <Button kind="secondary" onClick={addPair}>{__('Add Key-Value Pair')}</Button>
-    </div>
-  );
-};
-
 /** Helper function to prepare the request object for both edit and create */
 export const prepareRequestObject = (values, formId) => {
   const requestObject = { ...values };
diff --git a/app/javascript/components/ansible-playbook-edit-catalog-form/index.jsx b/app/javascript/components/ansible-playbook-edit-catalog-form/index.jsx
index 9bbd811e549..a12e9c5019a 100644
--- a/app/javascript/components/ansible-playbook-edit-catalog-form/index.jsx
+++ b/app/javascript/components/ansible-playbook-edit-catalog-form/index.jsx
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import createSchema from './schema';
 import componentMapper from '../../forms/mappers/componentMapper';
 import {
-  KeyValueListComponent,
   CopyFromProvisonButton,
   TreeViewReduxWrapper,
   conditionalCheckbox,
@@ -159,7 +158,6 @@ const AnsiblePlayBookEditCatalogForm = ({ initialData }) => {
 
   const mapper = {
     ...componentMapper,
-    'key-value-list': KeyValueListComponent,
     'copy-from-provisioning': CopyFromProvisonButton,
     'tree-view-redux': TreeViewReduxWrapper,
     'conditional-checkbox': conditionalCheckbox,
diff --git a/app/javascript/components/key-value-list/index.jsx b/app/javascript/components/key-value-list/index.jsx
new file mode 100644
index 00000000000..eed5eb13f1e
--- /dev/null
+++ b/app/javascript/components/key-value-list/index.jsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import { useFieldApi, useFormApi } from '@@ddf';
+import { Button, TextInput } from 'carbon-components-react';
+import { TrashCan32 } from '@carbon/icons-react';
+
+/** component used as a mapper to include the key value pairs ofr extra vars */
+const KeyValueListComponent = (props) => {
+  const {
+    input, label, keyLabel, valueLabel,
+  } = useFieldApi(props);
+  const formOptions = useFormApi();
+
+  const addPair = () => {
+    const newPairs = [...input.value, { key: '', value: '' }];
+    formOptions.change(input.name, newPairs);
+  };
+
+  const deletePair = (index) => {
+    const newPairs = [...input.value];
+    newPairs.splice(index, 1);
+    formOptions.change(input.name, newPairs);
+  };
+
+  const updatePair = (index, key, value) => {
+    const newPairs = [...input.value];
+    newPairs[index] = { key, value };
+    formOptions.change(input.name, newPairs);
+  };
+
+  return (
+    <div className="key-value-list-component-wrapper">
+      <label htmlFor={input.name} className="bx--label">{label}</label>
+      <br />
+      {input.value && input.value.map((pair, index) => (
+        // eslint-disable-next-line react/no-array-index-key
+        <div key={index} className="key-value-list-pair">
+          <TextInput
+            id={`${input.name}.${index}.key`}
+            labelText={keyLabel}
+            value={pair.key}
+            onChange={(event) => updatePair(index, event.target.value, pair.value)}
+          />
+          <TextInput
+            id={`${input.name}.${index}.value`}
+            labelText={valueLabel}
+            value={pair.value}
+            onChange={(event) => updatePair(index, pair.key, event.target.value)}
+          />
+          <Button
+            hasIconOnly
+            kind="danger"
+            className="key-value-delete"
+            renderIcon={TrashCan32}
+            iconDescription="Delete Key-Value Pair"
+            onClick={() => deletePair(index)}
+          />
+        </div>
+      ))}
+      <Button kind="secondary" onClick={addPair}>{__('Add Key-Value Pair')}</Button>
+    </div>
+  );
+};
+
+export default KeyValueListComponent;
diff --git a/app/javascript/components/terraform-template-catalog-form/helper.js b/app/javascript/components/terraform-template-catalog-form/helper.js
index fe785f432f4..14cb3f80f78 100644
--- a/app/javascript/components/terraform-template-catalog-form/helper.js
+++ b/app/javascript/components/terraform-template-catalog-form/helper.js
@@ -1,7 +1,6 @@
 import { useFieldApi, useFormApi } from '@@ddf';
 import React from 'react';
-import { Button, TextInput, Checkbox } from 'carbon-components-react';
-import { TrashCan32 } from '@carbon/icons-react';
+import { Checkbox } from 'carbon-components-react';
 import PropTypes from 'prop-types';
 import { TreeViewRedux } from '../tree-view';
 
@@ -154,64 +153,6 @@ TreeViewReduxWrapper.propTypes = {
   roleAllows: PropTypes.bool.isRequired,
 };
 
-/** component used as a mapper to include the key value pairs ofr extra vars */
-export const KeyValueListComponent = (props) => {
-  const {
-    input, label, keyLabel, valueLabel,
-  } = useFieldApi(props);
-  const formOptions = useFormApi();
-
-  const addPair = () => {
-    const newPairs = [...input.value, { key: '', value: '' }];
-    formOptions.change(input.name, newPairs);
-  };
-
-  const deletePair = (index) => {
-    const newPairs = [...input.value];
-    newPairs.splice(index, 1);
-    formOptions.change(input.name, newPairs);
-  };
-
-  const updatePair = (index, key, value) => {
-    const newPairs = [...input.value];
-    newPairs[index] = { key, value };
-    formOptions.change(input.name, newPairs);
-  };
-
-  return (
-    <div className="key-value-list-component-wrapper">
-      <label htmlFor={input.name} className="bx--label">{label}</label>
-      <br />
-      {input.value && input.value.map((pair, index) => (
-        // eslint-disable-next-line react/no-array-index-key
-        <div key={index} className="key-value-list-pair">
-          <TextInput
-            id={`${input.name}.${index}.key`}
-            labelText={keyLabel}
-            value={pair.key}
-            onChange={(event) => updatePair(index, event.target.value, pair.value)}
-          />
-          <TextInput
-            id={`${input.name}.${index}.value`}
-            labelText={valueLabel}
-            value={pair.value}
-            onChange={(event) => updatePair(index, pair.key, event.target.value)}
-          />
-          <Button
-            hasIconOnly
-            kind="danger"
-            className="key-value-delete"
-            renderIcon={TrashCan32}
-            iconDescription="Delete Key-Value Pair"
-            onClick={() => deletePair(index)}
-          />
-        </div>
-      ))}
-      <Button kind="secondary" onClick={addPair}>{__('Add Key-Value Pair')}</Button>
-    </div>
-  );
-};
-
 /** Helper function to prepare the request object for both edit and create */
 export const prepareRequestObject = (values, formId) => {
   const requestObject = { ...values };
diff --git a/app/javascript/components/terraform-template-catalog-form/index.jsx b/app/javascript/components/terraform-template-catalog-form/index.jsx
index a0b96fed644..f8f3c6e6fd3 100644
--- a/app/javascript/components/terraform-template-catalog-form/index.jsx
+++ b/app/javascript/components/terraform-template-catalog-form/index.jsx
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import createSchema from './terraform-template-catalog-form.schema';
 import componentMapper from '../../forms/mappers/componentMapper';
 import {
-  KeyValueListComponent,
   //   CopyFromProvisonButton,
   TreeViewReduxWrapper,
   conditionalCheckbox,
@@ -143,7 +142,6 @@ const TerraformTemplateCatalogForm = ({ initialData }) => {
 
   const mapper = {
     ...componentMapper,
-    'key-value-list': KeyValueListComponent,
     // 'copy-from-provisioning': CopyFromProvisonButton,
     'tree-view-redux': TreeViewReduxWrapper,
     'conditional-checkbox': conditionalCheckbox,
diff --git a/app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js b/app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js
index 861d3565eac..d3d20a2c8ed 100644
--- a/app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js
+++ b/app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js
@@ -212,7 +212,7 @@ const provisionTabSchema = (
         name: 'config_info.provision.dialog_type',
         label: __('Dialog'),
         options: [{ value: 'useExisting', label: __('Use Existing') }, { value: 'createNew', label: __('Create New') }],
-      },      
+      },
       {
         component: componentTypes.SELECT,
         id: 'config_info.provision.dialog_id',
diff --git a/app/javascript/forms/mappers/componentMapper.jsx b/app/javascript/forms/mappers/componentMapper.jsx
index c2fa1cd0f94..6a0be897059 100644
--- a/app/javascript/forms/mappers/componentMapper.jsx
+++ b/app/javascript/forms/mappers/componentMapper.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { componentMapper } from '@data-driven-forms/carbon-component-mapper';
 import { componentTypes } from '@@ddf';
 import AsyncCredentials from '../../components/async-credentials/async-credentials';
@@ -11,12 +10,14 @@ import { TreeViewField, TreeViewSelector } from '../../components/tree-view';
 import MultiSelectWithSelectAll from '../../components/multiselect-with-selectall';
 import FontIconPicker from '../../components/fonticon-picker';
 import FontIconPickerDdf from '../../components/fonticon-picker/font-icon-picker-ddf';
+import KeyValueListComponent from '../../components/key-value-list';
 
 const mapper = {
   ...componentMapper,
   'code-editor': CodeEditor,
   'edit-password-field': EditPasswordField,
   'file-upload': FileUploadComponent,
+  'key-value-list': KeyValueListComponent,
   'password-field': PasswordField,
   'validate-credentials': AsyncCredentials,
   'tree-view': TreeViewField,
diff --git a/app/javascript/spec/action-form/__snapshots__/action-form.spec.js.snap b/app/javascript/spec/action-form/__snapshots__/action-form.spec.js.snap
index 90cbda1e1fb..f91a4efe875 100644
--- a/app/javascript/spec/action-form/__snapshots__/action-form.spec.js.snap
+++ b/app/javascript/spec/action-form/__snapshots__/action-form.spec.js.snap
@@ -824,6 +824,7 @@ exports[`Action Form Component should render adding a new action 1`] = `
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1535,6 +1536,7 @@ exports[`Action Form Component should render adding a new action 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap b/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
index 601dcb307b5..ee49645286b 100644
--- a/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
+++ b/app/javascript/spec/add-remove-security-groups-form/__snapshots__/add-remove-security-groups-form.spec.js.snap
@@ -138,6 +138,7 @@ exports[`Add/remove security groups form component should remove security group
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -201,6 +202,7 @@ exports[`Add/remove security groups form component should remove security group
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/ansible-credentials-form/__snapshots__/ansible-credentials-form.spec.js.snap b/app/javascript/spec/ansible-credentials-form/__snapshots__/ansible-credentials-form.spec.js.snap
index 19d4211a2d1..a6cca7aacd8 100644
--- a/app/javascript/spec/ansible-credentials-form/__snapshots__/ansible-credentials-form.spec.js.snap
+++ b/app/javascript/spec/ansible-credentials-form/__snapshots__/ansible-credentials-form.spec.js.snap
@@ -98,6 +98,7 @@ exports[`Ansible Credential Form Component should render adding a new credential
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -191,6 +192,7 @@ exports[`Ansible Credential Form Component should render adding a new credential
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1581,6 +1583,7 @@ exports[`Ansible Credential Form Component should render editing a credential 1`
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1681,6 +1684,7 @@ exports[`Ansible Credential Form Component should render editing a credential 1`
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/c-and-u-collections-form/__snapshots__/c-and-u-collections-form.spec.js.snap b/app/javascript/spec/c-and-u-collections-form/__snapshots__/c-and-u-collections-form.spec.js.snap
index 60dd95d7d99..a3309c1043a 100644
--- a/app/javascript/spec/c-and-u-collections-form/__snapshots__/c-and-u-collections-form.spec.js.snap
+++ b/app/javascript/spec/c-and-u-collections-form/__snapshots__/c-and-u-collections-form.spec.js.snap
@@ -104,6 +104,7 @@ exports[`DiagnosticsCURepairForm Component Should add a record from DiagnosticsC
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -213,6 +214,7 @@ exports[`DiagnosticsCURepairForm Component Should add a record from DiagnosticsC
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/cloud-database-form/__snapshots__/cloud-database-form.spec.js.snap b/app/javascript/spec/cloud-database-form/__snapshots__/cloud-database-form.spec.js.snap
index 2cbf9b0cf7d..c8901d37111 100644
--- a/app/javascript/spec/cloud-database-form/__snapshots__/cloud-database-form.spec.js.snap
+++ b/app/javascript/spec/cloud-database-form/__snapshots__/cloud-database-form.spec.js.snap
@@ -136,6 +136,7 @@ exports[`Cloud Database form component should render "Edit" form 1`] = `
                     "file-upload": [Function],
                     "font-icon-picker": [Function],
                     "font-icon-picker-ddf": [Function],
+                    "key-value-list": [Function],
                     "multi-select": [Function],
                     "password-field": [Function],
                     "plain-text": [Function],
@@ -218,6 +219,7 @@ exports[`Cloud Database form component should render "Edit" form 1`] = `
                       "file-upload": [Function],
                       "font-icon-picker": [Function],
                       "font-icon-picker-ddf": [Function],
+                      "key-value-list": [Function],
                       "multi-select": [Function],
                       "password-field": [Function],
                       "plain-text": [Function],
diff --git a/app/javascript/spec/cloud-object-store-container-form/__snapshots__/cloud-object-store-container-form.spec.js.snap b/app/javascript/spec/cloud-object-store-container-form/__snapshots__/cloud-object-store-container-form.spec.js.snap
index 1c91a0a2e39..20f77546828 100644
--- a/app/javascript/spec/cloud-object-store-container-form/__snapshots__/cloud-object-store-container-form.spec.js.snap
+++ b/app/javascript/spec/cloud-object-store-container-form/__snapshots__/cloud-object-store-container-form.spec.js.snap
@@ -68,6 +68,7 @@ exports[`Cloud Object Store Container form component should add Amazon cloud obj
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -132,6 +133,7 @@ exports[`Cloud Object Store Container form component should add Amazon cloud obj
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -984,6 +986,7 @@ exports[`Cloud Object Store Container form component should add Openstack cloud
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1048,6 +1051,7 @@ exports[`Cloud Object Store Container form component should add Openstack cloud
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1876,6 +1880,7 @@ exports[`Cloud Object Store Container form component should render add cloud obj
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1940,6 +1945,7 @@ exports[`Cloud Object Store Container form component should render add cloud obj
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/cloud-volume-actions-form/__snapshots__/cloud-volume-actions-form.spec.js.snap b/app/javascript/spec/cloud-volume-actions-form/__snapshots__/cloud-volume-actions-form.spec.js.snap
index b3487ae0b58..756eb97e237 100644
--- a/app/javascript/spec/cloud-volume-actions-form/__snapshots__/cloud-volume-actions-form.spec.js.snap
+++ b/app/javascript/spec/cloud-volume-actions-form/__snapshots__/cloud-volume-actions-form.spec.js.snap
@@ -100,6 +100,7 @@ exports[`Cloud Volume Backup Create form component should render the cloud volum
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -192,6 +193,7 @@ exports[`Cloud Volume Backup Create form component should render the cloud volum
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1638,6 +1640,7 @@ exports[`Cloud Volume Backup Create form component when adding a new backup of c
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1730,6 +1733,7 @@ exports[`Cloud Volume Backup Create form component when adding a new backup of c
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -3156,6 +3160,7 @@ exports[`Cloud Volume Restore from backup form component should render the cloud
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -3228,6 +3233,7 @@ exports[`Cloud Volume Restore from backup form component should render the cloud
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4247,6 +4253,7 @@ exports[`Cloud Volume Restore from backup form component when restoring cloud vo
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -4319,6 +4326,7 @@ exports[`Cloud Volume Restore from backup form component when restoring cloud vo
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -5330,6 +5338,7 @@ exports[`Cloud Volume Snapshot Create form component should render the cloud vol
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -5394,6 +5403,7 @@ exports[`Cloud Volume Snapshot Create form component should render the cloud vol
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -6179,6 +6189,7 @@ exports[`Cloud Volume Snapshot Create form component when adding a new snapshot
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -6243,6 +6254,7 @@ exports[`Cloud Volume Snapshot Create form component when adding a new snapshot
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/cloud-volume-form/__snapshots__/attach-detach-cloud-volume-form.spec.js.snap b/app/javascript/spec/cloud-volume-form/__snapshots__/attach-detach-cloud-volume-form.spec.js.snap
index eb86f377754..760a94acb2d 100644
--- a/app/javascript/spec/cloud-volume-form/__snapshots__/attach-detach-cloud-volume-form.spec.js.snap
+++ b/app/javascript/spec/cloud-volume-form/__snapshots__/attach-detach-cloud-volume-form.spec.js.snap
@@ -131,6 +131,7 @@ exports[`Attach / Detach form component should render Attach Cloud Volume to the
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -224,6 +225,7 @@ exports[`Attach / Detach form component should render Attach Cloud Volume to the
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
@@ -1392,6 +1394,7 @@ exports[`Attach / Detach form component should render Attach Selected Cloud Volu
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1485,6 +1488,7 @@ exports[`Attach / Detach form component should render Attach Selected Cloud Volu
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
@@ -2640,6 +2644,7 @@ exports[`Attach / Detach form component should render Detach Cloud Volume from t
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -2720,6 +2725,7 @@ exports[`Attach / Detach form component should render Detach Cloud Volume from t
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
@@ -3681,6 +3687,7 @@ exports[`Attach / Detach form component should render Detach Selected Cloud Volu
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -3761,6 +3768,7 @@ exports[`Attach / Detach form component should render Detach Selected Cloud Volu
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
@@ -4737,6 +4745,7 @@ exports[`Attach / Detach form component should submit Attach API call 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4830,6 +4839,7 @@ exports[`Attach / Detach form component should submit Attach API call 1`] = `
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
@@ -5985,6 +5995,7 @@ exports[`Attach / Detach form component should submit Detach API call 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -6065,6 +6076,7 @@ exports[`Attach / Detach form component should submit Detach API call 1`] = `
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
diff --git a/app/javascript/spec/data-store-fore/__snapshots__/datastore-form.spec.js.snap b/app/javascript/spec/data-store-fore/__snapshots__/datastore-form.spec.js.snap
index a392aa4bdc0..91ab3ae201f 100644
--- a/app/javascript/spec/data-store-fore/__snapshots__/datastore-form.spec.js.snap
+++ b/app/javascript/spec/data-store-fore/__snapshots__/datastore-form.spec.js.snap
@@ -173,6 +173,7 @@ exports[`Datastore form component Datastore domain form component should render
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -269,6 +270,7 @@ exports[`Datastore form component Datastore domain form component should render
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1759,6 +1761,7 @@ exports[`Datastore form component Datastore namespace form component should rend
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1858,6 +1861,7 @@ exports[`Datastore form component Datastore namespace form component should rend
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/diagnostics-collect-log-form/__snapshots__/diagnostics-collect-log-form.spec.js.snap b/app/javascript/spec/diagnostics-collect-log-form/__snapshots__/diagnostics-collect-log-form.spec.js.snap
index 747bc061893..9c653c790d4 100644
--- a/app/javascript/spec/diagnostics-collect-log-form/__snapshots__/diagnostics-collect-log-form.spec.js.snap
+++ b/app/javascript/spec/diagnostics-collect-log-form/__snapshots__/diagnostics-collect-log-form.spec.js.snap
@@ -111,6 +111,7 @@ exports[`Diagnostics Collect Log form component should render edit DiagnosticsCo
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -203,6 +204,7 @@ exports[`Diagnostics Collect Log form component should render edit DiagnosticsCo
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1654,6 +1656,7 @@ exports[`Diagnostics Collect Log form component should render edit DiagnosticsCo
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1746,6 +1749,7 @@ exports[`Diagnostics Collect Log form component should render edit DiagnosticsCo
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -3202,6 +3206,7 @@ exports[`Diagnostics Collect Log form component should render new DiagnosticsCol
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -3299,6 +3304,7 @@ exports[`Diagnostics Collect Log form component should render new DiagnosticsCol
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/embedded-terraform-credentials-form/__snapshots__/embedded-terraform-credentials-form.spec.js.snap b/app/javascript/spec/embedded-terraform-credentials-form/__snapshots__/embedded-terraform-credentials-form.spec.js.snap
index 8f329917aef..253ade47751 100644
--- a/app/javascript/spec/embedded-terraform-credentials-form/__snapshots__/embedded-terraform-credentials-form.spec.js.snap
+++ b/app/javascript/spec/embedded-terraform-credentials-form/__snapshots__/embedded-terraform-credentials-form.spec.js.snap
@@ -99,6 +99,7 @@ exports[`Embedded Terraform Credential Form Component should render adding a new
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -193,6 +194,7 @@ exports[`Embedded Terraform Credential Form Component should render adding a new
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1604,6 +1606,7 @@ exports[`Embedded Terraform Credential Form Component should render editing a cr
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1705,6 +1708,7 @@ exports[`Embedded Terraform Credential Form Component should render editing a cr
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/evacuate-form/__snapshots__/evacuate-form.spec.js.snap b/app/javascript/spec/evacuate-form/__snapshots__/evacuate-form.spec.js.snap
index 0dd65d40030..26f9dd79bcf 100644
--- a/app/javascript/spec/evacuate-form/__snapshots__/evacuate-form.spec.js.snap
+++ b/app/javascript/spec/evacuate-form/__snapshots__/evacuate-form.spec.js.snap
@@ -125,6 +125,7 @@ exports[`evacuate form component should render evacuate form when hosts empty 1`
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -236,6 +237,7 @@ exports[`evacuate form component should render evacuate form when hosts empty 1`
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -2056,6 +2058,7 @@ exports[`evacuate form component should render evacuate form with host options 1
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -2188,6 +2191,7 @@ exports[`evacuate form component should render evacuate form with host options 1
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4367,6 +4371,7 @@ exports[`evacuate form component should render evacuate form with multiple insta
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -4478,6 +4483,7 @@ exports[`evacuate form component should render evacuate form with multiple insta
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap b/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
index 66f33b298f7..8e93b5bf7e7 100644
--- a/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
+++ b/app/javascript/spec/generic-objects-form/__snapshots__/generic-objects-form.spec.js.snap
@@ -38,6 +38,7 @@ exports[`Generic Object Form Component should render adding a new generic object
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -296,6 +297,7 @@ exports[`Generic Object Form Component should render adding a new generic object
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -557,6 +559,7 @@ exports[`Generic Object Form Component should render adding a new generic object
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4635,6 +4638,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -4951,6 +4955,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -5270,6 +5275,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -12256,6 +12262,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -12569,6 +12576,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -12885,6 +12893,7 @@ exports[`Generic Object Form Component should render editing a generic object wi
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/host-aggregate-form/__snapshots__/host-aggregate-form.spec.js.snap b/app/javascript/spec/host-aggregate-form/__snapshots__/host-aggregate-form.spec.js.snap
index 4d6557f87fa..15cc65bd286 100644
--- a/app/javascript/spec/host-aggregate-form/__snapshots__/host-aggregate-form.spec.js.snap
+++ b/app/javascript/spec/host-aggregate-form/__snapshots__/host-aggregate-form.spec.js.snap
@@ -94,6 +94,7 @@ exports[`Host aggregate form component should render add host form variant (remv
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -152,6 +153,7 @@ exports[`Host aggregate form component should render add host form variant (remv
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/host-edit-form/__snapshots__/host-edit-form.spec.js.snap b/app/javascript/spec/host-edit-form/__snapshots__/host-edit-form.spec.js.snap
index 2fa98ecddcc..c274d051484 100644
--- a/app/javascript/spec/host-edit-form/__snapshots__/host-edit-form.spec.js.snap
+++ b/app/javascript/spec/host-edit-form/__snapshots__/host-edit-form.spec.js.snap
@@ -38,6 +38,7 @@ exports[`Show Edit Host Form Component should render form for *one* host 1`] = `
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -258,6 +259,7 @@ exports[`Show Edit Host Form Component should render form for *one* host 1`] = `
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -485,6 +487,7 @@ exports[`Show Edit Host Form Component should render form for *one* host 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -5523,6 +5526,7 @@ exports[`Show Edit Host Form Component should render form for multiple hosts 1`]
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -5582,6 +5586,7 @@ exports[`Show Edit Host Form Component should render form for multiple hosts 1`]
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -5648,6 +5653,7 @@ exports[`Show Edit Host Form Component should render form for multiple hosts 1`]
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/host-initiator-group-form/__snapshots__/host-initiator-group.spec.js.snap b/app/javascript/spec/host-initiator-group-form/__snapshots__/host-initiator-group.spec.js.snap
index e1e208cb81e..f7528d0d7a0 100644
--- a/app/javascript/spec/host-initiator-group-form/__snapshots__/host-initiator-group.spec.js.snap
+++ b/app/javascript/spec/host-initiator-group-form/__snapshots__/host-initiator-group.spec.js.snap
@@ -107,6 +107,7 @@ exports[`Host Initiator Group Form Loads data and renders 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -208,6 +209,7 @@ exports[`Host Initiator Group Form Loads data and renders 1`] = `
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
diff --git a/app/javascript/spec/live-migrate-form/__snapshots__/live-migrate-form.spec.js.snap b/app/javascript/spec/live-migrate-form/__snapshots__/live-migrate-form.spec.js.snap
index 0423aae64a9..3320e272d44 100644
--- a/app/javascript/spec/live-migrate-form/__snapshots__/live-migrate-form.spec.js.snap
+++ b/app/javascript/spec/live-migrate-form/__snapshots__/live-migrate-form.spec.js.snap
@@ -117,6 +117,7 @@ exports[`Live Migrate form component should render live migrate form when hosts
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -226,6 +227,7 @@ exports[`Live Migrate form component should render live migrate form when hosts
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1992,6 +1994,7 @@ exports[`Live Migrate form component should render live migrate form with host o
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -2122,6 +2125,7 @@ exports[`Live Migrate form component should render live migrate form with host o
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4247,6 +4251,7 @@ exports[`Live Migrate form component should render live migrate form with multip
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -4356,6 +4361,7 @@ exports[`Live Migrate form component should render live migrate form with multip
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/physical-storage-form/__snapshots__/physical-storage-form.spec.js.snap b/app/javascript/spec/physical-storage-form/__snapshots__/physical-storage-form.spec.js.snap
index 757082d3893..8b88311f2f4 100644
--- a/app/javascript/spec/physical-storage-form/__snapshots__/physical-storage-form.spec.js.snap
+++ b/app/javascript/spec/physical-storage-form/__snapshots__/physical-storage-form.spec.js.snap
@@ -28,6 +28,7 @@ exports[`Physical storage form component should render adding form variant 1`] =
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -301,6 +302,7 @@ exports[`Physical storage form component should render editing form variant 1`]
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -549,6 +551,7 @@ exports[`Physical storage form component should render editing form variant 1`]
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -800,6 +803,7 @@ exports[`Physical storage form component should render editing form variant 1`]
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
diff --git a/app/javascript/spec/pxe-customization-template-form/__snapshots__/pxe-customization-template-form.spec.js.snap b/app/javascript/spec/pxe-customization-template-form/__snapshots__/pxe-customization-template-form.spec.js.snap
index 12563657d0e..61f87418796 100644
--- a/app/javascript/spec/pxe-customization-template-form/__snapshots__/pxe-customization-template-form.spec.js.snap
+++ b/app/javascript/spec/pxe-customization-template-form/__snapshots__/pxe-customization-template-form.spec.js.snap
@@ -137,6 +137,7 @@ exports[`Pxe Customization Template Form Component should render adding a new px
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -263,6 +264,7 @@ exports[`Pxe Customization Template Form Component should render adding a new px
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -2763,6 +2765,7 @@ exports[`Pxe Customization Template Form Component should render copying a pxe c
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -2898,6 +2901,7 @@ exports[`Pxe Customization Template Form Component should render copying a pxe c
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -5425,6 +5429,7 @@ exports[`Pxe Customization Template Form Component should render editing a pxe c
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -5560,6 +5565,7 @@ exports[`Pxe Customization Template Form Component should render editing a pxe c
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/pxe-image-type-form/__snapshots__/pxe-image-type-form.spec.js.snap b/app/javascript/spec/pxe-image-type-form/__snapshots__/pxe-image-type-form.spec.js.snap
index 5c1407c21e5..2b788fa6335 100644
--- a/app/javascript/spec/pxe-image-type-form/__snapshots__/pxe-image-type-form.spec.js.snap
+++ b/app/javascript/spec/pxe-image-type-form/__snapshots__/pxe-image-type-form.spec.js.snap
@@ -92,6 +92,7 @@ exports[`Pxe Image Type Form Component should render adding a new pxe image type
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -179,6 +180,7 @@ exports[`Pxe Image Type Form Component should render adding a new pxe image type
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1590,6 +1592,7 @@ exports[`Pxe Image Type Form Component should render editing a pxe image type 1`
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1683,6 +1686,7 @@ exports[`Pxe Image Type Form Component should render editing a pxe image type 1`
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/pxe-iso-datastore-form/__snapshots__/pxe-iso-datastore-form.spec.js.snap b/app/javascript/spec/pxe-iso-datastore-form/__snapshots__/pxe-iso-datastore-form.spec.js.snap
index 671eec67db8..14332a0bdb0 100644
--- a/app/javascript/spec/pxe-iso-datastore-form/__snapshots__/pxe-iso-datastore-form.spec.js.snap
+++ b/app/javascript/spec/pxe-iso-datastore-form/__snapshots__/pxe-iso-datastore-form.spec.js.snap
@@ -97,6 +97,7 @@ exports[`Pxe Iso Datastore Form Component should render adding a new iso datasto
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -177,6 +178,7 @@ exports[`Pxe Iso Datastore Form Component should render adding a new iso datasto
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/pxe-iso-image-form/__snapshots__/pxe-iso-image-form.spec.js.snap b/app/javascript/spec/pxe-iso-image-form/__snapshots__/pxe-iso-image-form.spec.js.snap
index 0242d88782a..5c8c95da7bd 100644
--- a/app/javascript/spec/pxe-iso-image-form/__snapshots__/pxe-iso-image-form.spec.js.snap
+++ b/app/javascript/spec/pxe-iso-image-form/__snapshots__/pxe-iso-image-form.spec.js.snap
@@ -78,6 +78,7 @@ exports[`Pxe Edit Iso Image Form Component should render editing a iso image 1`]
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -149,6 +150,7 @@ exports[`Pxe Edit Iso Image Form Component should render editing a iso image 1`]
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap b/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
index 4481ced8832..42f3f037da8 100644
--- a/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
+++ b/app/javascript/spec/reconfigure-vm-form/__snapshots__/reconfigure-vm-form.spec.js.snap
@@ -100,6 +100,7 @@ exports[`Reconfigure VM form component should render form with only fields it ha
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -406,6 +407,7 @@ exports[`Reconfigure VM form component should render form with only fields it ha
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -717,6 +719,7 @@ exports[`Reconfigure VM form component should render form with only fields it ha
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -4584,6 +4587,7 @@ exports[`Reconfigure VM form component should render reconfigure form and click
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -4994,6 +4998,7 @@ exports[`Reconfigure VM form component should render reconfigure form and click
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -5409,6 +5414,7 @@ exports[`Reconfigure VM form component should render reconfigure form and click
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -15930,6 +15936,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show c
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -16042,6 +16049,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show c
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -16159,6 +16167,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show c
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -17399,6 +17408,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -17616,6 +17626,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -17838,6 +17849,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -21194,6 +21206,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -21411,6 +21424,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -21633,6 +21647,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show d
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -24968,6 +24983,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -25191,6 +25207,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -25419,6 +25436,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show h
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -30019,6 +30037,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show n
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -30161,6 +30180,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show n
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -30308,6 +30328,7 @@ exports[`Reconfigure VM form component should render reconfigure form and show n
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -32122,6 +32143,7 @@ exports[`Reconfigure VM form component should render reconfigure form with datat
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -32533,6 +32555,7 @@ exports[`Reconfigure VM form component should render reconfigure form with datat
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -32949,6 +32972,7 @@ exports[`Reconfigure VM form component should render reconfigure form with datat
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -43643,6 +43667,7 @@ exports[`Reconfigure VM form component should render reconfigure form without da
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -43866,6 +43891,7 @@ exports[`Reconfigure VM form component should render reconfigure form without da
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -44094,6 +44120,7 @@ exports[`Reconfigure VM form component should render reconfigure form without da
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -48694,6 +48721,7 @@ exports[`Reconfigure VM form component should render reconfigure sub form and cl
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -49103,6 +49131,7 @@ exports[`Reconfigure VM form component should render reconfigure sub form and cl
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -49517,6 +49546,7 @@ exports[`Reconfigure VM form component should render reconfigure sub form and cl
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap b/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
index 5f66a742d81..d742c4ecbad 100644
--- a/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
+++ b/app/javascript/spec/schedule-form/__snapshots__/schedule-form.spec.js.snap
@@ -729,6 +729,7 @@ exports[`Schedule form component should render edit form when filter_type is not
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1369,6 +1370,7 @@ exports[`Schedule form component should render edit form when filter_type is not
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -15542,6 +15544,7 @@ exports[`Schedule form component should render edit form when filter_type is nul
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -16324,6 +16327,7 @@ exports[`Schedule form component should render edit form when filter_type is nul
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -33730,6 +33734,7 @@ exports[`Schedule form component should render schedule add form 1`] = `
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -34293,6 +34298,7 @@ exports[`Schedule form component should render schedule add form 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/service-request-default-form/__snapshots__/service-request-default-form.spec.js.snap b/app/javascript/spec/service-request-default-form/__snapshots__/service-request-default-form.spec.js.snap
index 118f031591c..ea262c3510e 100644
--- a/app/javascript/spec/service-request-default-form/__snapshots__/service-request-default-form.spec.js.snap
+++ b/app/javascript/spec/service-request-default-form/__snapshots__/service-request-default-form.spec.js.snap
@@ -328,6 +328,7 @@ exports[`Show Service Request Page should render 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -529,6 +530,7 @@ exports[`Show Service Request Page should render 1`] = `
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
diff --git a/app/javascript/spec/settings-category-form/__snapshots__/settings-category-form.spec.js.snap b/app/javascript/spec/settings-category-form/__snapshots__/settings-category-form.spec.js.snap
index bc4902129a9..e7b8de26a77 100644
--- a/app/javascript/spec/settings-category-form/__snapshots__/settings-category-form.spec.js.snap
+++ b/app/javascript/spec/settings-category-form/__snapshots__/settings-category-form.spec.js.snap
@@ -139,6 +139,7 @@ exports[`SettingsCategoryForm Component should render a new SettingsCategoryForm
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -271,6 +272,7 @@ exports[`SettingsCategoryForm Component should render a new SettingsCategoryForm
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap b/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
index c232ad39783..555519805b7 100644
--- a/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
+++ b/app/javascript/spec/settings-time-profile-form/__snapshots__/settings-time-profile-form.spec.js.snap
@@ -499,6 +499,7 @@ exports[`VM common form component should render adding form variant add new time
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -997,6 +998,7 @@ exports[`VM common form component should render adding form variant add new time
                 "file-upload": [Function],
                 "font-icon-picker": [Function],
                 "font-icon-picker-ddf": [Function],
+                "key-value-list": [Function],
                 "multi-select": [Function],
                 "password-field": [Function],
                 "plain-text": [Function],
diff --git a/app/javascript/spec/vm-floating-ips-form/__snapshots__/vm-floating-ips-form.spec.js.snap b/app/javascript/spec/vm-floating-ips-form/__snapshots__/vm-floating-ips-form.spec.js.snap
index 9123718af98..5d4979b5c8a 100644
--- a/app/javascript/spec/vm-floating-ips-form/__snapshots__/vm-floating-ips-form.spec.js.snap
+++ b/app/javascript/spec/vm-floating-ips-form/__snapshots__/vm-floating-ips-form.spec.js.snap
@@ -61,6 +61,7 @@ exports[`Associate / Disassociate form component should render associate form va
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -124,6 +125,7 @@ exports[`Associate / Disassociate form component should render associate form va
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1087,6 +1089,7 @@ exports[`Associate / Disassociate form component should render disassociate form
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1150,6 +1153,7 @@ exports[`Associate / Disassociate form component should render disassociate form
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -2140,6 +2144,7 @@ exports[`Associate / Disassociate form component should submit Associate API cal
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -2203,6 +2208,7 @@ exports[`Associate / Disassociate form component should submit Associate API cal
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -3046,6 +3052,7 @@ exports[`Associate / Disassociate form component should submit Disassociate API
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -3109,6 +3116,7 @@ exports[`Associate / Disassociate form component should submit Disassociate API
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/vm-resize-form/__snapshots__/vm-resize-form.spec.js.snap b/app/javascript/spec/vm-resize-form/__snapshots__/vm-resize-form.spec.js.snap
index a339a5241fd..d3490c3f82e 100644
--- a/app/javascript/spec/vm-resize-form/__snapshots__/vm-resize-form.spec.js.snap
+++ b/app/javascript/spec/vm-resize-form/__snapshots__/vm-resize-form.spec.js.snap
@@ -71,6 +71,7 @@ exports[`vm resize form component should render a resize form 1`] = `
                     "file-upload": [Function],
                     "font-icon-picker": [Function],
                     "font-icon-picker-ddf": [Function],
+                    "key-value-list": [Function],
                     "multi-select": [Function],
                     "password-field": [Function],
                     "plain-text": [Function],
@@ -135,6 +136,7 @@ exports[`vm resize form component should render a resize form 1`] = `
                       "file-upload": [Function],
                       "font-icon-picker": [Function],
                       "font-icon-picker-ddf": [Function],
+                      "key-value-list": [Function],
                       "multi-select": [Function],
                       "password-field": [Function],
                       "plain-text": [Function],
diff --git a/app/javascript/spec/workflow-credential-mapping-form/__snapshots__/workflow-credential-mapping-form.spec.js.snap b/app/javascript/spec/workflow-credential-mapping-form/__snapshots__/workflow-credential-mapping-form.spec.js.snap
index b42ce7709a4..592bd392d38 100644
--- a/app/javascript/spec/workflow-credential-mapping-form/__snapshots__/workflow-credential-mapping-form.spec.js.snap
+++ b/app/javascript/spec/workflow-credential-mapping-form/__snapshots__/workflow-credential-mapping-form.spec.js.snap
@@ -64,6 +64,7 @@ exports[`Workflow Credential Form Component should render mapping credentials to
           "file-upload": [Function],
           "font-icon-picker": [Function],
           "font-icon-picker-ddf": [Function],
+          "key-value-list": [Function],
           "multi-select": [Function],
           "password-field": [Function],
           "plain-text": [Function],
@@ -250,6 +251,7 @@ exports[`Workflow Credential Form Component should render mapping credentials to
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -439,6 +441,7 @@ exports[`Workflow Credential Form Component should render mapping credentials to
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/workflow-credentials-form/__snapshots__/workflow-credentials-form.spec.js.snap b/app/javascript/spec/workflow-credentials-form/__snapshots__/workflow-credentials-form.spec.js.snap
index 3df6e3fe898..1137c8f3822 100644
--- a/app/javascript/spec/workflow-credentials-form/__snapshots__/workflow-credentials-form.spec.js.snap
+++ b/app/javascript/spec/workflow-credentials-form/__snapshots__/workflow-credentials-form.spec.js.snap
@@ -99,6 +99,7 @@ exports[`Workflow Credential Form Component should render adding a new credentia
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -193,6 +194,7 @@ exports[`Workflow Credential Form Component should render adding a new credentia
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
@@ -1604,6 +1606,7 @@ exports[`Workflow Credential Form Component should render editing a credential 1
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -1705,6 +1708,7 @@ exports[`Workflow Credential Form Component should render editing a credential 1
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],
diff --git a/app/javascript/spec/zone-form/__snapshots__/zone-form.spec.js.snap b/app/javascript/spec/zone-form/__snapshots__/zone-form.spec.js.snap
index 84df0d15886..a5986bcde2b 100644
--- a/app/javascript/spec/zone-form/__snapshots__/zone-form.spec.js.snap
+++ b/app/javascript/spec/zone-form/__snapshots__/zone-form.spec.js.snap
@@ -313,6 +313,7 @@ exports[`zone Form Component should render editing a zone form 1`] = `
             "file-upload": [Function],
             "font-icon-picker": [Function],
             "font-icon-picker-ddf": [Function],
+            "key-value-list": [Function],
             "multi-select": [Function],
             "password-field": [Function],
             "plain-text": [Function],
@@ -483,6 +484,7 @@ exports[`zone Form Component should render editing a zone form 1`] = `
               "file-upload": [Function],
               "font-icon-picker": [Function],
               "font-icon-picker-ddf": [Function],
+              "key-value-list": [Function],
               "multi-select": [Function],
               "password-field": [Function],
               "plain-text": [Function],