diff --git a/src/components/common/DynamicListForm.jsx b/src/components/common/DynamicListForm.jsx
deleted file mode 100644
index 70976f794..000000000
--- a/src/components/common/DynamicListForm.jsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button } from "@patternfly/react-core/dist/esm/components/Button";
-import { EmptyState, EmptyStateBody } from "@patternfly/react-core/dist/esm/components/EmptyState";
-import { FormFieldGroup, FormFieldGroupHeader } from "@patternfly/react-core/dist/esm/components/Form";
-import { HelperText, HelperTextItem } from "@patternfly/react-core/dist/esm/components/HelperText";
-
-import './DynamicListForm.scss';
-
-export class DynamicListForm extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            list: [],
-        };
-        this.keyCounter = 0;
-        this.removeItem = this.removeItem.bind(this);
-        this.addItem = this.addItem.bind(this);
-        this.onItemChange = this.onItemChange.bind(this);
-    }
-
-    removeItem(idx, field, value) {
-        this.setState(state => {
-            const items = state.list.concat();
-            items.splice(idx, 1);
-            return { list: items };
-        }, () => this.props.onChange(this.state.list.concat()));
-    }
-
-    addItem() {
-        this.setState(state => {
-            return { list: [...state.list, Object.assign({ key: this.keyCounter++ }, this.props.default)] };
-        }, () => this.props.onChange(this.state.list.concat()));
-    }
-
-    onItemChange(idx, field, value) {
-        this.setState(state => {
-            const items = state.list.concat();
-            items[idx][field] = value || null;
-            return { list: items };
-        }, () => this.props.onChange(this.state.list.concat()));
-    }
-
-    render () {
-        const { id, label, actionLabel, formclass, emptyStateString, helperText } = this.props;
-        const dialogValues = this.state;
-        return (
-            <FormFieldGroup header={
-                <FormFieldGroupHeader
-                    titleText={{ text: label }}
-                    actions={<Button variant="secondary" className="btn-add" onClick={this.addItem}>{actionLabel}</Button>}
-                />
-            } className={"dynamic-form-group " + formclass}>
-                {
-                    dialogValues.list.length
-                        ? <>
-                            {dialogValues.list.map((item, idx) => {
-                                return React.cloneElement(this.props.itemcomponent, {
-                                    idx,
-                                    item,
-                                    id: id + "-" + idx,
-                                    key: idx,
-                                    onChange: this.onItemChange,
-                                    removeitem: this.removeItem,
-                                    additem: this.addItem,
-                                    options: this.props.options,
-                                    itemCount: Object.keys(dialogValues.list).length,
-                                });
-                            })
-                            }
-                            {helperText &&
-                            <HelperText>
-                                <HelperTextItem>{helperText}</HelperTextItem>
-                            </HelperText>
-                            }
-                        </>
-                        : <EmptyState>
-                            <EmptyStateBody>
-                                {emptyStateString}
-                            </EmptyStateBody>
-                        </EmptyState>
-                }
-            </FormFieldGroup>
-        );
-    }
-}
-DynamicListForm.propTypes = {
-    emptyStateString: PropTypes.string.isRequired,
-    onChange: PropTypes.func.isRequired,
-    id: PropTypes.string.isRequired,
-    itemcomponent: PropTypes.object.isRequired,
-    formclass: PropTypes.string,
-    options: PropTypes.object,
-};
diff --git a/src/components/common/DynamicListForm.scss b/src/components/common/DynamicListForm.scss
deleted file mode 100644
index 1dfe40db8..000000000
--- a/src/components/common/DynamicListForm.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-@import "global-variables";
-
-.dynamic-form-group {
-    .pf-v5-c-empty-state {
-        padding: 0;
-    }
-
-    .pf-v5-c-form__label {
-        // Don't allow labels to wrap
-        white-space: nowrap;
-    }
-
-    .remove-button-group {
-        // Move 'Remove' button the the end of the row
-        grid-column: -1;
-        // Move 'Remove' button to the bottom of the line so as to align with the other form fields
-        display: flex;
-        align-items: flex-end;
-    }
-
-    // Set check to the same height as input widgets and vertically align
-    .pf-v5-c-form__group-control > .pf-v5-c-check {
-        // Set height to the same as inputs
-        // Font height is font size * line height (1rem * 1.5)
-        // Widgets have 5px padding, 1px border (top & bottom): (5 + 1) * 2 = 12
-        // This all equals to 36px
-        height: calc(var(--pf-v5-global--FontSize--md) * var(--pf-v5-global--LineHeight--md) + 12px);
-        align-content: center;
-    }
-
-    // We use FormFieldGroup PF component for the nested look and for ability to add buttons to the header
-    // However we want to save space and not add indent to the left so we need to override it
-    .pf-v5-c-form__field-group-body {
-        // Stretch content fully
-        --pf-v5-c-form__field-group-body--GridColumn: 1 / -1;
-        // Reduce padding at the top
-        --pf-v5-c-form__field-group-body--PaddingTop: var(--pf-v5-global--spacer--xs);
-    }
-}
diff --git a/src/components/create-vm-dialog/createVmDialog.jsx b/src/components/create-vm-dialog/createVmDialog.jsx
index d1e9dfed1..c5bd1ae0e 100644
--- a/src/components/create-vm-dialog/createVmDialog.jsx
+++ b/src/components/create-vm-dialog/createVmDialog.jsx
@@ -24,6 +24,7 @@ import { Divider } from "@patternfly/react-core/dist/esm/components/Divider";
 import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex";
 import { Form, FormGroup } from "@patternfly/react-core/dist/esm/components/Form";
 import { FormSelect, FormSelectOption } from "@patternfly/react-core/dist/esm/components/FormSelect";
+import { Grid, GridItem } from "@patternfly/react-core/dist/esm/layouts/Grid";
 import { InputGroup } from "@patternfly/react-core/dist/esm/components/InputGroup";
 import { Modal } from "@patternfly/react-core/dist/esm/components/Modal";
 import { Select as PFSelect, SelectGroup, SelectOption } from "@patternfly/react-core/dist/esm/deprecated/components/Select";
@@ -33,7 +34,7 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button";
 import { Tooltip } from "@patternfly/react-core/dist/esm/components/Tooltip";
 import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea";
 import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner";
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon, TrashIcon } from '@patternfly/react-icons';
 
 import { DialogsContext } from 'dialogs.jsx';
 import cockpit from 'cockpit';
@@ -84,6 +85,7 @@ import { domainCreate } from '../../libvirtApi/domain.js';
 import { storagePoolRefresh } from '../../libvirtApi/storagePool.js';
 import { getAccessToken } from '../../libvirtApi/rhel-images.js';
 import { PasswordFormFields, password_quality } from 'cockpit-components-password.jsx';
+import { DynamicListForm } from 'DynamicListForm.jsx';
 
 import './createVmDialog.scss';
 
@@ -248,6 +250,8 @@ function validateParams(vmParams) {
     }
     if (vmParams.userPassword && !vmParams.userLogin) {
         validationFailed.userLogin = _("User login must not be empty when user password is set");
+    } else if (vmParams.sshKeys.length > 0 && !vmParams.userLogin) {
+        validationFailed.userLogin = _("User login must not be empty when SSH keys are set");
     }
 
     return validationFailed;
@@ -748,6 +752,58 @@ const UsersConfigurationRow = ({
     );
 };
 
+// This method needs to be outside of component as re-render would create a new instance of debounce
+const validateKey = debounce(500, (key, setKeyObject) => {
+    cockpit.script(`echo ${key} | ssh-keygen -l -f /dev/stdin`, {})
+            .then(() => {
+                const parts = key.split(" ");
+                if (parts.length > 2) {
+                    setKeyObject({
+                        type: parts[0],
+                        data: parts[1],
+                        comment: parts[2], // comment is optional in SSH-format
+                    });
+                }
+            })
+            .catch(() => setKeyObject(undefined));
+});
+
+const SshKeysRow = ({
+    id, item, onChange, idx, removeitem,
+}) => {
+    const [keyObject, setKeyObject] = useState();
+
+    return (
+        <Grid id={id}>
+            <GridItem span={11}>
+                {keyObject
+                    ? <FlexItem>
+                        <strong>{keyObject.comment}</strong>
+                        <span>{keyObject.comment ? " - " + keyObject.type : keyObject.type}</span>
+                        <div>{keyObject.data}</div>
+                    </FlexItem>
+                    : <TextArea id="ssh-key"
+                        value={item.value || ""}
+                        onChange={(_, value) => {
+                            onChange(idx, "value", value);
+                            validateKey(value, setKeyObject);
+                        }}
+                        rows="3" />
+                }
+            </GridItem>
+            <GridItem span={1} className="pf-m-1-col-on-md remove-button-group">
+                <Button variant='plain'
+                    className="btn-close"
+                    id={id + "-btn-close"}
+                    isSmall
+                    aria-label={_("Remove item")}
+                    icon={<TrashIcon />}
+                    onClick={() => removeitem(idx)} />
+            </GridItem>
+        </Grid>
+    );
+};
+
 const CloudInitOptionsRow = ({
     onValueChanged,
     rootPassword,
@@ -755,13 +811,21 @@ const CloudInitOptionsRow = ({
     validationFailed,
 }) => {
     return (
-        <UsersConfigurationRow rootPassword={rootPassword}
-                               rootPasswordLabelInfo={_("Leave the password blank if you do not wish to set a root password")}
-                               showUserFields
-                               userLogin={userLogin}
-                               userPassword={userPassword}
-                               validationFailed={validationFailed}
-                               onValueChanged={onValueChanged} />
+        <>
+            <UsersConfigurationRow rootPassword={rootPassword}
+                                   rootPasswordLabelInfo={_("Leave the password blank if you do not wish to set a root password")}
+                                   showUserFields
+                                   userLogin={userLogin}
+                                   userPassword={userPassword}
+                                   validationFailed={validationFailed}
+                                   onValueChanged={onValueChanged} />
+            <DynamicListForm id="create-vm-dialog-ssh-key"
+                emptyStateString={_("No SSH keys specified")}
+                label={_("SSH keys")}
+                actionLabel={_("Add SSH keys")}
+                onChange={value => onValueChanged('sshKeys', value)}
+                itemcomponent={ <SshKeysRow />} />
+        </>
     );
 };
 
@@ -979,6 +1043,7 @@ class CreateVmModal extends React.Component {
             userLogin: '',
             accessToken: '',
             offlineToken: '',
+            sshKeys: [],
         };
         this.onCreateClicked = this.onCreateClicked.bind(this);
         this.onValueChanged = this.onValueChanged.bind(this);
@@ -1172,6 +1237,7 @@ class CreateVmModal extends React.Component {
                 userPassword: this.state.userPassword,
                 rootPassword: this.state.rootPassword,
                 userLogin: this.state.userLogin,
+                sshKeys: this.state.sshKeys.map(key => key.value),
                 startVm,
                 accessToken: this.state.accessToken,
                 loggedUser
diff --git a/src/libvirtApi/domain.js b/src/libvirtApi/domain.js
index bbc605b45..edc4cd3c5 100644
--- a/src/libvirtApi/domain.js
+++ b/src/libvirtApi/domain.js
@@ -267,7 +267,8 @@ export function domainCreate({
     userPassword,
     vmName,
     accessToken,
-    loggedUser
+    loggedUser,
+    sshKeys,
 }) {
     // shows dummy vm  until we get vm from virsh (cleans up inProgress)
     setVmCreateInProgress(vmName, connectionName, { openConsoleTab: startVm });
@@ -297,6 +298,7 @@ export function domainCreate({
         userLogin,
         userPassword,
         vmName,
+        sshKeys,
     };
 
     logDebug(`CREATE_VM(${vmName}): install_machine.py '${args}'`);
diff --git a/src/scripts/install_machine.py b/src/scripts/install_machine.py
index f5626cd26..0f95678d1 100755
--- a/src/scripts/install_machine.py
+++ b/src/scripts/install_machine.py
@@ -133,6 +133,10 @@ def prepare_cloud_init(args):
         if args['userLogin']:
             user_data_file.write("users:\n")
             user_data_file.write(f"  - name: {args['userLogin']}\n")
+            if 'sshKeys' in args and len(args['sshKeys']) > 0:
+                user_data_file.write("    ssh_authorized_keys:\n")
+                for key in args['sshKeys']:
+                    user_data_file.write(f"      - {key}\n")
 
         if args['rootPassword'] or args['userPassword']:
             # enable SSH password login if any password is set
diff --git a/test/check-machines-create b/test/check-machines-create
index dd02b02c2..24d7b04a3 100755
--- a/test/check-machines-create
+++ b/test/check-machines-create
@@ -276,6 +276,21 @@ class TestMachinesCreate(VirtualMachinesCase):
                                                                     os_short_id=config.FEDORA_28_SHORTID,
                                                                     create_and_run=True))
 
+        # try to CREATE few machines
+        # --cloud-init user-data option exists since virt-install >= 3.0.0
+        runner.createCloudBaseImageTest(TestMachinesCreate.VmDialog(self, sourceType='cloud',
+                                                                    storage_size=10, storage_size_unit='MiB',
+                                                                    location=config.VALID_DISK_IMAGE_PATH,
+                                                                    os_name=config.FEDORA_28,
+                                                                    os_short_id=config.FEDORA_28_SHORTID,
+                                                                    user_password="catsaremybestfr13nds",
+                                                                    user_login="foo",
+                                                                    root_password="dogsaremybestfr13nds",
+                                                                    ssh_keys=[
+                                                                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMTkmGaPexteXFD9bNdTq23UdZ5dsDexAAT9Y16T7lgW skobyda@redhat.com"
+                                                                    ],
+                                                                    create_and_run=True))
+
     def testCreateDownloadAnOS(self):
         runner = TestMachinesCreate.CreateVmRunner(self)
         config = TestMachinesCreate.TestCreateConfig
@@ -802,6 +817,7 @@ vnc_password= "{vnc_passwd}"
                      root_password=None,
                      user_password=None,
                      user_login=None,
+                     ssh_keys=None,
                      storage_pool=NEW_VOLUME_QCOW2, storage_volume='',
                      create_and_run=False,
                      delete=True,
@@ -847,6 +863,7 @@ vnc_password= "{vnc_passwd}"
             self.root_password = root_password
             self.user_password = user_password
             self.user_login = user_login
+            self.ssh_keys = ssh_keys
             self.create_and_run = create_and_run or is_unattended
             self.storage_pool = storage_pool
             self.storage_volume = storage_volume
@@ -1073,6 +1090,10 @@ vnc_password= "{vnc_passwd}"
 
                 self.assertIn("\nssh_pwauth: true", user_data)
 
+            if self.ssh_keys is not None:
+                for key in self.ssh_keys:
+                    self.assertIn(key, user_data)
+
             # --unattended option is conflicting with --cloud-init option, resulting --cloud-init user_data being ignored
             # https://bugzilla.redhat.com/show_bug.cgi?id=2096200#c14
             self.assertNotIn("--unattended", virt_install_cmd_out)
@@ -1234,6 +1255,10 @@ vnc_password= "{vnc_passwd}"
                     b.set_input_text("#user-login", self.user_login)
                 if self.root_password:
                     b.set_input_text("#create-vm-dialog-root-password-pw1", self.root_password)
+                if self.ssh_keys is not None:
+                    for idx, key in enumerate(self.ssh_keys):
+                        b.click("button:contains(Add SSH keys)")
+                        b.set_input_text(f"#create-vm-dialog-ssh-key-{idx} textarea", key, value_check=False, blur=False)
 
                 if self.is_unattended:
                     b.wait_visible("#create-and-edit[aria-disabled=true]")