diff --git a/releasenotes/notes/select_roles-e4aed7695f9ba45d.yaml b/releasenotes/notes/select_roles-e4aed7695f9ba45d.yaml
new file mode 100644
index 00000000..3ee35227
--- /dev/null
+++ b/releasenotes/notes/select_roles-e4aed7695f9ba45d.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Custom deployment roles selection. Roles section of Deployment plan page now
+    includes 'Manage Roles'. Clicking the link provides a list of all available
+    roles and lets user select roles intended for deployment.
diff --git a/src/js/actions/ZaqarActions.js b/src/js/actions/ZaqarActions.js
index feeafd82..25b2302a 100644
--- a/src/js/actions/ZaqarActions.js
+++ b/src/js/actions/ZaqarActions.js
@@ -95,6 +95,12 @@ export default {
           dispatch(RolesActions.fetchAvailableRolesFinished(payload, history));
           break;
         }
+        // TODO(jtomasek): change this back once underlining tripleo-common patch is fixed
+        case MistralConstants.SELECT_ROLES: {
+          // case 'tripleo.roles.v1.select_roles': {
+          dispatch(RolesActions.selectRolesFinished(payload, history));
+          break;
+        }
 
         default:
           break;
diff --git a/src/js/components/roles/AvailableRoleInput.js b/src/js/components/roles/AvailableRoleInput.js
index 9796224e..b75e3f6e 100644
--- a/src/js/components/roles/AvailableRoleInput.js
+++ b/src/js/components/roles/AvailableRoleInput.js
@@ -26,7 +26,7 @@ const AvailableRoleInput = ({
   input: { value, name, onChange },
   style
 }) => (
-  <Col xs={6} sm={4} md={3} lg={2} style={style}>
+  <Col xs={12} sm={4} lg={3} style={style}>
     <div
       className={cx(
         'card-pf card-pf-view card-pf-view-select card-pf-view-multi-select',
diff --git a/src/js/components/roles/SelectRolesDialog.js b/src/js/components/roles/SelectRolesDialog.js
index d6ca95e1..a03c3ef4 100644
--- a/src/js/components/roles/SelectRolesDialog.js
+++ b/src/js/components/roles/SelectRolesDialog.js
@@ -20,6 +20,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { ModalHeader, ModalTitle } from 'react-bootstrap';
 import React from 'react';
+import { pickBy } from 'lodash';
 import PropTypes from 'prop-types';
 
 import AvailableRoleInput from './AvailableRoleInput';
@@ -46,10 +47,16 @@ class SelectRolesDialog extends React.Component {
     this.props.fetchAvailableRoles();
   }
 
+  handleFormSubmit = (values, dispatch, formProps) => {
+    const roleNames = Object.keys(pickBy(values));
+    this.props.selectRoles(this.props.currentPlanName, roleNames);
+  };
+
   render() {
     const {
       availableRoles,
       availableRolesLoaded,
+      fetchingAvailableRoles,
       intl: { formatMessage },
       currentPlanName,
       roles
@@ -62,28 +69,31 @@ class SelectRolesDialog extends React.Component {
             <FormattedMessage {...messages.selectRolesTitle} />
           </ModalTitle>
         </ModalHeader>
-        <SelectRolesForm
-          initialValues={availableRoles.map(r => roles.includes(r)).toJS()}
-          currentPlanName={currentPlanName}
+        <Loader
+          height={100}
+          loaded={availableRolesLoaded && !fetchingAvailableRoles}
+          content={formatMessage(messages.loadingAvailableRoles)}
         >
-          <Loader
-            loaded={availableRolesLoaded}
-            content={formatMessage(messages.loadingAvailableRoles)}
+          <SelectRolesForm
+            onSubmit={this.handleFormSubmit}
+            initialValues={availableRoles
+              .map((_, key) => roles.keySeq().includes(key))
+              .toJS()}
+            availableRoles={availableRoles}
+            currentPlanName={currentPlanName}
           >
-            <div className="row row-cards-pf">
-              {availableRoles
-                .toList()
-                .map(role => (
-                  <Field
-                    component={AvailableRoleInput}
-                    role={role}
-                    name={role.name}
-                    key={role.name}
-                  />
-                ))}
-            </div>
-          </Loader>
-        </SelectRolesForm>
+            {availableRoles
+              .toList()
+              .map(role => (
+                <Field
+                  component={AvailableRoleInput}
+                  role={role}
+                  name={role.name}
+                  key={role.name}
+                />
+              ))}
+          </SelectRolesForm>
+        </Loader>
       </RoutedModal>
     );
   }
@@ -93,20 +103,25 @@ SelectRolesDialog.propTypes = {
   availableRolesLoaded: PropTypes.bool.isRequired,
   currentPlanName: PropTypes.string.isRequired,
   fetchAvailableRoles: PropTypes.func.isRequired,
+  fetchingAvailableRoles: PropTypes.bool.isRequired,
   intl: PropTypes.object.isRequired,
-  roles: ImmutablePropTypes.map.isRequired
+  roles: ImmutablePropTypes.map.isRequired,
+  selectRoles: PropTypes.func.isRequired
 };
 
 const mapStateToProps = state => ({
   availableRoles: getMergedRoles(state),
   availableRolesLoaded: state.availableRoles.loaded,
+  fetchingAvailableRoles: state.availableRoles.isFetching,
   currentPlanName: getCurrentPlanName(state),
   roles: getRoles(state)
 });
 
 const mapDispatchToProps = dispatch => ({
   fetchAvailableRoles: planName =>
-    dispatch(RolesActions.fetchAvailableRoles(planName))
+    dispatch(RolesActions.fetchAvailableRoles(planName)),
+  selectRoles: (planName, roleNames) =>
+    dispatch(RolesActions.selectRoles(planName, roleNames))
 });
 
 export default injectIntl(
diff --git a/src/js/components/roles/SelectRolesForm.js b/src/js/components/roles/SelectRolesForm.js
index 27e0c071..593fd621 100644
--- a/src/js/components/roles/SelectRolesForm.js
+++ b/src/js/components/roles/SelectRolesForm.js
@@ -16,37 +16,61 @@
 
 import { Button } from 'react-bootstrap';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-import { ModalBody, ModalFooter } from 'react-bootstrap';
+import { ModalFooter } from 'react-bootstrap';
+import { pickBy } from 'lodash';
+import { OverlayLoader } from '../ui/Loader';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { reduxForm } from 'redux-form';
 
 import { CloseModalButton } from '../ui/Modals';
-import FormErrorList from '../ui/forms/FormErrorList';
+import ModalFormErrorList from '../ui/forms/ModalFormErrorList';
 
 const messages = defineMessages({
   saveChanges: {
-    id: 'SelectRolesDialog.saveChanges',
+    id: 'SelectRolesForm.saveChanges',
     defaultMessage: 'Save Changes'
   },
   cancel: {
-    id: 'SelectRolesDialog.cancel',
+    id: 'SelectRolesForm.cancel',
     defaultMessage: 'Cancel'
+  },
+  updatingRoles: {
+    id: 'SelectRolesForm.updatingRoles',
+    defaultMessage: 'Updating Roles...'
+  },
+  primaryRoleValidationError: {
+    id: 'SelectRolesForm.primaryRoleValidationError',
+    defaultMessage:
+      'Please select one role tagged as "primary" and "controller"'
   }
 });
 
 class SelectRolesForm extends React.Component {
   render() {
-    const { children, error, handleSubmit, invalid, pristine } = this.props;
+    const {
+      children,
+      error,
+      handleSubmit,
+      invalid,
+      intl: { formatMessage },
+      pristine,
+      submitting
+    } = this.props;
     return (
       <form onSubmit={handleSubmit}>
-        <ModalBody>
-          <FormErrorList errors={error ? [error] : []} />
-          {children}
-        </ModalBody>
+        <OverlayLoader
+          loaded={!submitting}
+          content={formatMessage(messages.updatingRoles)}
+        >
+          <ModalFormErrorList errors={error ? [error] : []} />
+          <div className="cards-pf">
+            <div className="row row-cards-pf">{children}</div>
+          </div>
+        </OverlayLoader>
         <ModalFooter>
           <Button
-            disabled={invalid || pristine}
+            disabled={invalid || pristine || submitting}
             bsStyle="primary"
             type="submit"
           >
@@ -65,14 +89,29 @@ SelectRolesForm.propTypes = {
   currentPlanName: PropTypes.string.isRequired,
   error: PropTypes.object,
   handleSubmit: PropTypes.func.isRequired,
+  intl: PropTypes.object.isRequired,
   invalid: PropTypes.bool.isRequired,
-  pristine: PropTypes.bool.isRequired
+  pristine: PropTypes.bool.isRequired,
+  submitting: PropTypes.bool.isRequired
+};
+
+const validateForm = (values, { availableRoles }) => {
+  const errors = {};
+  const selectedRoleNames = Object.keys(pickBy(values));
+  const selectedRoles = availableRoles.filter((r, k) =>
+    selectedRoleNames.includes(k)
+  );
+  if (!selectedRoles.some(r => r.tags.includes('primary'))) {
+    errors._error = {
+      message: <FormattedMessage {...messages.primaryRoleValidationError} />
+    };
+  }
+  return errors;
 };
 
 const form = reduxForm({
-  enableReinitialize: true,
   form: 'selectRoles',
-  keepDirtyOnReinitialize: true
+  validate: validateForm
 });
 
 export default injectIntl(form(SelectRolesForm));
diff --git a/src/js/components/ui/forms/FormErrorList.js b/src/js/components/ui/forms/FormErrorList.js
index 3ef652dd..d6422d86 100644
--- a/src/js/components/ui/forms/FormErrorList.js
+++ b/src/js/components/ui/forms/FormErrorList.js
@@ -38,8 +38,7 @@ export default class FormErrorList extends React.Component {
     } else {
       return (
         <p>
-          <strong>{errors[0].title}</strong>
-          <br />
+          {errors[0].title && <strong>{errors[0].title}</strong>}{' '}
           {errors[0].message}
         </p>
       );
@@ -51,10 +50,7 @@ export default class FormErrorList extends React.Component {
       return null;
     } else {
       return (
-        <div
-          className="toast-pf form-error-list alert alert-danger"
-          role="alert"
-        >
+        <div className="form-error-list alert alert-danger" role="alert">
           <span className="pficon pficon-error-circle-o" aria-hidden="true" />
           {this.renderErrors()}
         </div>
diff --git a/src/js/constants/MistralConstants.js b/src/js/constants/MistralConstants.js
index 993f611d..f8302339 100644
--- a/src/js/constants/MistralConstants.js
+++ b/src/js/constants/MistralConstants.js
@@ -35,6 +35,7 @@ export default {
   PLAN_EXPORT: 'tripleo.plan_management.v1.export_deployment_plan',
   ROLE_LIST: 'tripleo.role.list',
   LIST_AVAILABLE_ROLES: 'tripleo.plan_management.v1.list_available_roles',
+  SELECT_ROLES: 'tripleo.plan_management.v1.select_roles',
   VALIDATIONS_LIST: 'tripleo.validations.list_validations',
   VALIDATIONS_RUN: 'tripleo.validations.v1.run_validation',
   VALIDATIONS_RUN_GROUPS: 'tripleo.validations.v1.run_groups'
diff --git a/src/js/constants/RolesConstants.js b/src/js/constants/RolesConstants.js
index 31a192d7..7a125db0 100644
--- a/src/js/constants/RolesConstants.js
+++ b/src/js/constants/RolesConstants.js
@@ -22,5 +22,6 @@ export default keyMirror({
   FETCH_AVAILABLE_ROLES_FAILED: null,
   FETCH_ROLES_PENDING: null,
   FETCH_ROLES_SUCCESS: null,
-  FETCH_ROLES_FAILED: null
+  FETCH_ROLES_FAILED: null,
+  SELECT_ROLES_SUCCESS: null
 });
diff --git a/src/js/reducers/rolesReducer.js b/src/js/reducers/rolesReducer.js
index d1337e80..ca0bc0dd 100644
--- a/src/js/reducers/rolesReducer.js
+++ b/src/js/reducers/rolesReducer.js
@@ -60,6 +60,7 @@ const rolesReducer = (state = initialState, action) => {
     case RolesConstants.FETCH_ROLES_PENDING:
       return state.set('isFetching', true);
 
+    case RolesConstants.SELECT_ROLES_SUCCESS:
     case RolesConstants.FETCH_ROLES_SUCCESS: {
       const roles = fromJS(action.payload).map(role =>
         new Role(role).update(role =>
@@ -79,6 +80,9 @@ const rolesReducer = (state = initialState, action) => {
         .set('isFetching', false)
         .set('loaded', true);
 
+    case RolesConstants.SELECT_ROLES_SUCCESS:
+      return state.set('roles', roles);
+
     case PlansConstants.PLAN_CHOSEN:
       return state.set('loaded', false);
 
diff --git a/src/less/ui/Forms.less b/src/less/ui/Forms.less
index 5afd827b..dc47a19a 100644
--- a/src/less/ui/Forms.less
+++ b/src/less/ui/Forms.less
@@ -30,6 +30,6 @@ form.form, form.form-horizontal {
   }
 }
 
-.form-error-list.toast-pf {
-  display: block;
-}
+.form-error-list {
+  margin-top: 20px;
+}
\ No newline at end of file
diff --git a/src/less/ui/Modals.less b/src/less/ui/Modals.less
index fcd7536a..1c03d19d 100644
--- a/src/less/ui/Modals.less
+++ b/src/less/ui/Modals.less
@@ -49,7 +49,6 @@
   border-bottom: 1px solid @modal-header-border-color ;
 }
 
-
 .modal-footer {
   margin-top: 0px;
   background-color: #f8f8f8;
@@ -59,7 +58,7 @@
 
 .modal-form-error-list {
   &:extend(.modal-header, .modal .modal-header);
-  .toast-pf.form-error-list {
-    margin-bottom: 0;
+  .form-error-list {
+    margin: 0;
   }
 }