diff --git a/src/plugins/data_source_management/public/components/edit_data_source/__snapshots__/edit_data_source.test.tsx.snap b/src/plugins/data_source_management/public/components/edit_data_source/__snapshots__/edit_data_source.test.tsx.snap
index 85e08d85ecef..a3d004457a78 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/__snapshots__/edit_data_source.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/edit_data_source/__snapshots__/edit_data_source.test.tsx.snap
@@ -59,6 +59,7 @@ exports[`Datasource Management: Edit Datasource Wizard should load resources suc
       />
     </EuiSpacer>
     <EditDataSourceForm
+      displayToastMessage={[Function]}
       existingDataSource={
         Object {
           "auth": Object {
@@ -573,177 +574,82 @@ exports[`Datasource Management: Edit Datasource Wizard should load resources suc
                   className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
                 />
               </EuiHorizontalRule>
-              <EuiDescribedFormGroup
-                description={
-                  <p>
-                    <FormattedMessage
-                      defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                      id="dataSourcesManagement.editDataSource.endpointDescription"
-                      values={Object {}}
-                    />
-                  </p>
-                }
-                title={
-                  <h4>
-                    <FormattedMessage
-                      defaultMessage="Endpoint"
-                      id="dataSourcesManagement.editDataSource.endpointTitle"
-                      values={Object {}}
-                    />
-                  </h4>
-                }
+              <EuiFormRow
+                describedByIds={Array []}
+                display="row"
+                fullWidth={true}
+                hasChildLabel={true}
+                hasEmptyLabelSpace={false}
+                label="Endpoint URL"
+                labelType="label"
               >
                 <div
-                  className="euiDescribedFormGroup"
-                  role="group"
+                  className="euiFormRow euiFormRow--fullWidth"
+                  id="generated-id-row"
                 >
-                  <EuiFlexGroup
-                    gutterSize="l"
+                  <div
+                    className="euiFormRow__labelWrapper"
                   >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    <EuiFormLabel
+                      className="euiFormRow__label"
+                      htmlFor="generated-id"
+                      isFocused={false}
+                      type="label"
                     >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiTitle
-                            className="euiDescribedFormGroup__title"
-                            size="xs"
-                          >
-                            <h4
-                              className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                            >
-                              <FormattedMessage
-                                defaultMessage="Endpoint"
-                                id="dataSourcesManagement.editDataSource.endpointTitle"
-                                values={Object {}}
-                              >
-                                <span>
-                                  Endpoint
-                                </span>
-                              </FormattedMessage>
-                            </h4>
-                          </EuiTitle>
-                          <EuiText
-                            className="euiDescribedFormGroup__description"
-                            color="subdued"
-                            size="s"
-                          >
-                            <div
-                              className="euiText euiText--small euiDescribedFormGroup__description"
-                            >
-                              <EuiTextColor
-                                color="subdued"
-                                component="div"
-                              >
-                                <div
-                                  className="euiTextColor euiTextColor--subdued"
-                                >
-                                  <p>
-                                    <FormattedMessage
-                                      defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                                      id="dataSourcesManagement.editDataSource.endpointDescription"
-                                      values={Object {}}
-                                    >
-                                      <span>
-                                        This connection information is used for reference in tables and when adding to a data source connection
-                                      </span>
-                                    </FormattedMessage>
-                                  </p>
-                                </div>
-                              </EuiTextColor>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem
-                        className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                      <label
+                        className="euiFormLabel euiFormRow__label"
+                        htmlFor="generated-id"
+                      >
+                        Endpoint URL
+                      </label>
+                    </EuiFormLabel>
+                  </div>
+                  <div
+                    className="euiFormRow__fieldWrapper"
+                  >
+                    <EuiFieldText
+                      aria-disabled={true}
+                      data-test-subj="editDatasourceEndpointField"
+                      disabled={true}
+                      fullWidth={true}
+                      id="generated-id"
+                      name="endpoint"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
+                      value="https://test.com"
+                    >
+                      <EuiFormControlLayout
+                        fullWidth={true}
+                        inputId="generated-id"
                       >
                         <div
-                          className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                          className="euiFormControlLayout euiFormControlLayout--fullWidth"
                         >
-                          <EuiFormRow
-                            describedByIds={Array []}
-                            display="row"
-                            fullWidth={false}
-                            hasChildLabel={true}
-                            hasEmptyLabelSpace={false}
-                            label="Endpoint URL"
-                            labelType="label"
+                          <div
+                            className="euiFormControlLayout__childrenWrapper"
                           >
-                            <div
-                              className="euiFormRow"
-                              id="generated-id-row"
-                            >
-                              <div
-                                className="euiFormRow__labelWrapper"
-                              >
-                                <EuiFormLabel
-                                  className="euiFormRow__label"
-                                  htmlFor="generated-id"
-                                  isFocused={false}
-                                  type="label"
-                                >
-                                  <label
-                                    className="euiFormLabel euiFormRow__label"
-                                    htmlFor="generated-id"
-                                  >
-                                    Endpoint URL
-                                  </label>
-                                </EuiFormLabel>
-                              </div>
-                              <div
-                                className="euiFormRow__fieldWrapper"
-                              >
-                                <EuiFieldText
-                                  aria-disabled={true}
-                                  data-test-subj="editDatasourceEndpointField"
-                                  disabled={true}
-                                  id="generated-id"
-                                  name="endpoint"
-                                  onBlur={[Function]}
-                                  onFocus={[Function]}
-                                  value="https://test.com"
-                                >
-                                  <EuiFormControlLayout
-                                    fullWidth={false}
-                                    inputId="generated-id"
-                                  >
-                                    <div
-                                      className="euiFormControlLayout"
-                                    >
-                                      <div
-                                        className="euiFormControlLayout__childrenWrapper"
-                                      >
-                                        <EuiValidatableControl>
-                                          <input
-                                            aria-disabled={true}
-                                            className="euiFieldText"
-                                            data-test-subj="editDatasourceEndpointField"
-                                            disabled={true}
-                                            id="generated-id"
-                                            name="endpoint"
-                                            onBlur={[Function]}
-                                            onFocus={[Function]}
-                                            type="text"
-                                            value="https://test.com"
-                                          />
-                                        </EuiValidatableControl>
-                                        <EuiFormControlLayoutIcons />
-                                      </div>
-                                    </div>
-                                  </EuiFormControlLayout>
-                                </EuiFieldText>
-                              </div>
-                            </div>
-                          </EuiFormRow>
+                            <EuiValidatableControl>
+                              <input
+                                aria-disabled={true}
+                                className="euiFieldText euiFieldText--fullWidth"
+                                data-test-subj="editDatasourceEndpointField"
+                                disabled={true}
+                                id="generated-id"
+                                name="endpoint"
+                                onBlur={[Function]}
+                                onFocus={[Function]}
+                                type="text"
+                                value="https://test.com"
+                              />
+                            </EuiValidatableControl>
+                            <EuiFormControlLayoutIcons />
+                          </div>
                         </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
+                      </EuiFormControlLayout>
+                    </EuiFieldText>
+                  </div>
                 </div>
-              </EuiDescribedFormGroup>
+              </EuiFormRow>
             </div>
           </EuiPanel>
           <EuiSpacer
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/__snapshots__/edit_data_source_form.test.tsx.snap b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/__snapshots__/edit_data_source_form.test.tsx.snap
index fbdc0767bf3d..1ce16bf131c2 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/__snapshots__/edit_data_source_form.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/__snapshots__/edit_data_source_form.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`Datasource Management: Edit Datasource Form Case 1: With Username & Pas
   locale="en"
 >
   <EditDataSourceForm
+    displayToastMessage={[MockFunction]}
     existingDataSource={
       Object {
         "auth": Object {
@@ -520,177 +521,82 @@ exports[`Datasource Management: Edit Datasource Form Case 1: With Username & Pas
                 className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
               />
             </EuiHorizontalRule>
-            <EuiDescribedFormGroup
-              description={
-                <p>
-                  <FormattedMessage
-                    defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                    id="dataSourcesManagement.editDataSource.endpointDescription"
-                    values={Object {}}
-                  />
-                </p>
-              }
-              title={
-                <h4>
-                  <FormattedMessage
-                    defaultMessage="Endpoint"
-                    id="dataSourcesManagement.editDataSource.endpointTitle"
-                    values={Object {}}
-                  />
-                </h4>
-              }
+            <EuiFormRow
+              describedByIds={Array []}
+              display="row"
+              fullWidth={true}
+              hasChildLabel={true}
+              hasEmptyLabelSpace={false}
+              label="Endpoint URL"
+              labelType="label"
             >
               <div
-                className="euiDescribedFormGroup"
-                role="group"
+                className="euiFormRow euiFormRow--fullWidth"
+                id="generated-id-row"
               >
-                <EuiFlexGroup
-                  gutterSize="l"
+                <div
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                  <EuiFormLabel
+                    className="euiFormRow__label"
+                    htmlFor="generated-id"
+                    isFocused={false}
+                    type="label"
                   >
-                    <EuiFlexItem>
-                      <div
-                        className="euiFlexItem"
-                      >
-                        <EuiTitle
-                          className="euiDescribedFormGroup__title"
-                          size="xs"
-                        >
-                          <h4
-                            className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          >
-                            <FormattedMessage
-                              defaultMessage="Endpoint"
-                              id="dataSourcesManagement.editDataSource.endpointTitle"
-                              values={Object {}}
-                            >
-                              <span>
-                                Endpoint
-                              </span>
-                            </FormattedMessage>
-                          </h4>
-                        </EuiTitle>
-                        <EuiText
-                          className="euiDescribedFormGroup__description"
-                          color="subdued"
-                          size="s"
-                        >
-                          <div
-                            className="euiText euiText--small euiDescribedFormGroup__description"
-                          >
-                            <EuiTextColor
-                              color="subdued"
-                              component="div"
-                            >
-                              <div
-                                className="euiTextColor euiTextColor--subdued"
-                              >
-                                <p>
-                                  <FormattedMessage
-                                    defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                                    id="dataSourcesManagement.editDataSource.endpointDescription"
-                                    values={Object {}}
-                                  >
-                                    <span>
-                                      This connection information is used for reference in tables and when adding to a data source connection
-                                    </span>
-                                  </FormattedMessage>
-                                </p>
-                              </div>
-                            </EuiTextColor>
-                          </div>
-                        </EuiText>
-                      </div>
-                    </EuiFlexItem>
-                    <EuiFlexItem
-                      className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                    <label
+                      className="euiFormLabel euiFormRow__label"
+                      htmlFor="generated-id"
+                    >
+                      Endpoint URL
+                    </label>
+                  </EuiFormLabel>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <EuiFieldText
+                    aria-disabled={true}
+                    data-test-subj="editDatasourceEndpointField"
+                    disabled={true}
+                    fullWidth={true}
+                    id="generated-id"
+                    name="endpoint"
+                    onBlur={[Function]}
+                    onFocus={[Function]}
+                    value="https://test.com"
+                  >
+                    <EuiFormControlLayout
+                      fullWidth={true}
+                      inputId="generated-id"
                     >
                       <div
-                        className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                        className="euiFormControlLayout euiFormControlLayout--fullWidth"
                       >
-                        <EuiFormRow
-                          describedByIds={Array []}
-                          display="row"
-                          fullWidth={false}
-                          hasChildLabel={true}
-                          hasEmptyLabelSpace={false}
-                          label="Endpoint URL"
-                          labelType="label"
+                        <div
+                          className="euiFormControlLayout__childrenWrapper"
                         >
-                          <div
-                            className="euiFormRow"
-                            id="generated-id-row"
-                          >
-                            <div
-                              className="euiFormRow__labelWrapper"
-                            >
-                              <EuiFormLabel
-                                className="euiFormRow__label"
-                                htmlFor="generated-id"
-                                isFocused={false}
-                                type="label"
-                              >
-                                <label
-                                  className="euiFormLabel euiFormRow__label"
-                                  htmlFor="generated-id"
-                                >
-                                  Endpoint URL
-                                </label>
-                              </EuiFormLabel>
-                            </div>
-                            <div
-                              className="euiFormRow__fieldWrapper"
-                            >
-                              <EuiFieldText
-                                aria-disabled={true}
-                                data-test-subj="editDatasourceEndpointField"
-                                disabled={true}
-                                id="generated-id"
-                                name="endpoint"
-                                onBlur={[Function]}
-                                onFocus={[Function]}
-                                value="https://test.com"
-                              >
-                                <EuiFormControlLayout
-                                  fullWidth={false}
-                                  inputId="generated-id"
-                                >
-                                  <div
-                                    className="euiFormControlLayout"
-                                  >
-                                    <div
-                                      className="euiFormControlLayout__childrenWrapper"
-                                    >
-                                      <EuiValidatableControl>
-                                        <input
-                                          aria-disabled={true}
-                                          className="euiFieldText"
-                                          data-test-subj="editDatasourceEndpointField"
-                                          disabled={true}
-                                          id="generated-id"
-                                          name="endpoint"
-                                          onBlur={[Function]}
-                                          onFocus={[Function]}
-                                          type="text"
-                                          value="https://test.com"
-                                        />
-                                      </EuiValidatableControl>
-                                      <EuiFormControlLayoutIcons />
-                                    </div>
-                                  </div>
-                                </EuiFormControlLayout>
-                              </EuiFieldText>
-                            </div>
-                          </div>
-                        </EuiFormRow>
+                          <EuiValidatableControl>
+                            <input
+                              aria-disabled={true}
+                              className="euiFieldText euiFieldText--fullWidth"
+                              data-test-subj="editDatasourceEndpointField"
+                              disabled={true}
+                              id="generated-id"
+                              name="endpoint"
+                              onBlur={[Function]}
+                              onFocus={[Function]}
+                              type="text"
+                              value="https://test.com"
+                            />
+                          </EuiValidatableControl>
+                          <EuiFormControlLayoutIcons />
+                        </div>
                       </div>
-                    </EuiFlexItem>
-                  </div>
-                </EuiFlexGroup>
+                    </EuiFormControlLayout>
+                  </EuiFieldText>
+                </div>
               </div>
-            </EuiDescribedFormGroup>
+            </EuiFormRow>
           </div>
         </EuiPanel>
         <EuiSpacer
@@ -1270,6 +1176,61 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
   locale="en"
 >
   <EditDataSourceForm
+    displayToastMessage={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "auth": Object {
+                "credentials": Object {
+                  "password": "testPassword",
+                  "username": "test123",
+                },
+                "type": "username_password",
+              },
+              "description": "jest testing",
+              "endpoint": undefined,
+              "title": "create-test-ds",
+            },
+            true,
+          ],
+          Array [
+            Object {
+              "defaultMessage": "Password updated successfully.",
+              "id": "dataSourcesManagement.editDataSource.updatePasswordSuccessMsg",
+              "success": true,
+            },
+          ],
+          Array [
+            Object {
+              "auth": Object {
+                "credentials": Object {
+                  "username": "test123",
+                },
+                "type": "username_password",
+              },
+              "description": "testDescription",
+              "title": "create-test-ds",
+            },
+            false,
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     existingDataSource={
       Object {
         "auth": Object {
@@ -1307,6 +1268,14 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
               "endpoint": undefined,
               "title": "create-test-ds",
             },
+            true,
+          ],
+          Array [
+            Object {
+              "defaultMessage": "Password updated successfully.",
+              "id": "dataSourcesManagement.editDataSource.updatePasswordSuccessMsg",
+              "success": true,
+            },
           ],
           Array [
             Object {
@@ -1319,6 +1288,7 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
               "description": "testDescription",
               "title": "create-test-ds",
             },
+            false,
           ],
         ],
         "results": Array [
@@ -1330,6 +1300,10 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
             "type": "return",
             "value": undefined,
           },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
         ],
       }
     }
@@ -1349,6 +1323,14 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
               "endpoint": undefined,
               "title": "create-test-ds",
             },
+            true,
+          ],
+          Array [
+            Object {
+              "defaultMessage": "Password updated successfully.",
+              "id": "dataSourcesManagement.editDataSource.updatePasswordSuccessMsg",
+              "success": true,
+            },
           ],
           Array [
             Object {
@@ -1361,6 +1343,7 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
               "description": "testDescription",
               "title": "create-test-ds",
             },
+            false,
           ],
         ],
         "results": Array [
@@ -1372,6 +1355,10 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
             "type": "return",
             "value": undefined,
           },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
         ],
       }
     }
@@ -1864,177 +1851,82 @@ exports[`Datasource Management: Edit Datasource Form Case 2: With No Authenticat
                 className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
               />
             </EuiHorizontalRule>
-            <EuiDescribedFormGroup
-              description={
-                <p>
-                  <FormattedMessage
-                    defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                    id="dataSourcesManagement.editDataSource.endpointDescription"
-                    values={Object {}}
-                  />
-                </p>
-              }
-              title={
-                <h4>
-                  <FormattedMessage
-                    defaultMessage="Endpoint"
-                    id="dataSourcesManagement.editDataSource.endpointTitle"
-                    values={Object {}}
-                  />
-                </h4>
-              }
+            <EuiFormRow
+              describedByIds={Array []}
+              display="row"
+              fullWidth={true}
+              hasChildLabel={true}
+              hasEmptyLabelSpace={false}
+              label="Endpoint URL"
+              labelType="label"
             >
               <div
-                className="euiDescribedFormGroup"
-                role="group"
+                className="euiFormRow euiFormRow--fullWidth"
+                id="generated-id-row"
               >
-                <EuiFlexGroup
-                  gutterSize="l"
+                <div
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                  <EuiFormLabel
+                    className="euiFormRow__label"
+                    htmlFor="generated-id"
+                    isFocused={false}
+                    type="label"
                   >
-                    <EuiFlexItem>
-                      <div
-                        className="euiFlexItem"
-                      >
-                        <EuiTitle
-                          className="euiDescribedFormGroup__title"
-                          size="xs"
-                        >
-                          <h4
-                            className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          >
-                            <FormattedMessage
-                              defaultMessage="Endpoint"
-                              id="dataSourcesManagement.editDataSource.endpointTitle"
-                              values={Object {}}
-                            >
-                              <span>
-                                Endpoint
-                              </span>
-                            </FormattedMessage>
-                          </h4>
-                        </EuiTitle>
-                        <EuiText
-                          className="euiDescribedFormGroup__description"
-                          color="subdued"
-                          size="s"
-                        >
-                          <div
-                            className="euiText euiText--small euiDescribedFormGroup__description"
-                          >
-                            <EuiTextColor
-                              color="subdued"
-                              component="div"
-                            >
-                              <div
-                                className="euiTextColor euiTextColor--subdued"
-                              >
-                                <p>
-                                  <FormattedMessage
-                                    defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                                    id="dataSourcesManagement.editDataSource.endpointDescription"
-                                    values={Object {}}
-                                  >
-                                    <span>
-                                      This connection information is used for reference in tables and when adding to a data source connection
-                                    </span>
-                                  </FormattedMessage>
-                                </p>
-                              </div>
-                            </EuiTextColor>
-                          </div>
-                        </EuiText>
-                      </div>
-                    </EuiFlexItem>
-                    <EuiFlexItem
-                      className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                    <label
+                      className="euiFormLabel euiFormRow__label"
+                      htmlFor="generated-id"
+                    >
+                      Endpoint URL
+                    </label>
+                  </EuiFormLabel>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <EuiFieldText
+                    aria-disabled={true}
+                    data-test-subj="editDatasourceEndpointField"
+                    disabled={true}
+                    fullWidth={true}
+                    id="generated-id"
+                    name="endpoint"
+                    onBlur={[Function]}
+                    onFocus={[Function]}
+                    value="https://test.com"
+                  >
+                    <EuiFormControlLayout
+                      fullWidth={true}
+                      inputId="generated-id"
                     >
                       <div
-                        className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                        className="euiFormControlLayout euiFormControlLayout--fullWidth"
                       >
-                        <EuiFormRow
-                          describedByIds={Array []}
-                          display="row"
-                          fullWidth={false}
-                          hasChildLabel={true}
-                          hasEmptyLabelSpace={false}
-                          label="Endpoint URL"
-                          labelType="label"
+                        <div
+                          className="euiFormControlLayout__childrenWrapper"
                         >
-                          <div
-                            className="euiFormRow"
-                            id="generated-id-row"
-                          >
-                            <div
-                              className="euiFormRow__labelWrapper"
-                            >
-                              <EuiFormLabel
-                                className="euiFormRow__label"
-                                htmlFor="generated-id"
-                                isFocused={false}
-                                type="label"
-                              >
-                                <label
-                                  className="euiFormLabel euiFormRow__label"
-                                  htmlFor="generated-id"
-                                >
-                                  Endpoint URL
-                                </label>
-                              </EuiFormLabel>
-                            </div>
-                            <div
-                              className="euiFormRow__fieldWrapper"
-                            >
-                              <EuiFieldText
-                                aria-disabled={true}
-                                data-test-subj="editDatasourceEndpointField"
-                                disabled={true}
-                                id="generated-id"
-                                name="endpoint"
-                                onBlur={[Function]}
-                                onFocus={[Function]}
-                                value="https://test.com"
-                              >
-                                <EuiFormControlLayout
-                                  fullWidth={false}
-                                  inputId="generated-id"
-                                >
-                                  <div
-                                    className="euiFormControlLayout"
-                                  >
-                                    <div
-                                      className="euiFormControlLayout__childrenWrapper"
-                                    >
-                                      <EuiValidatableControl>
-                                        <input
-                                          aria-disabled={true}
-                                          className="euiFieldText"
-                                          data-test-subj="editDatasourceEndpointField"
-                                          disabled={true}
-                                          id="generated-id"
-                                          name="endpoint"
-                                          onBlur={[Function]}
-                                          onFocus={[Function]}
-                                          type="text"
-                                          value="https://test.com"
-                                        />
-                                      </EuiValidatableControl>
-                                      <EuiFormControlLayoutIcons />
-                                    </div>
-                                  </div>
-                                </EuiFormControlLayout>
-                              </EuiFieldText>
-                            </div>
-                          </div>
-                        </EuiFormRow>
+                          <EuiValidatableControl>
+                            <input
+                              aria-disabled={true}
+                              className="euiFieldText euiFieldText--fullWidth"
+                              data-test-subj="editDatasourceEndpointField"
+                              disabled={true}
+                              id="generated-id"
+                              name="endpoint"
+                              onBlur={[Function]}
+                              onFocus={[Function]}
+                              type="text"
+                              value="https://test.com"
+                            />
+                          </EuiValidatableControl>
+                          <EuiFormControlLayoutIcons />
+                        </div>
                       </div>
-                    </EuiFlexItem>
-                  </div>
-                </EuiFlexGroup>
+                    </EuiFormControlLayout>
+                  </EuiFieldText>
+                </div>
               </div>
-            </EuiDescribedFormGroup>
+            </EuiFormRow>
           </div>
         </EuiPanel>
         <EuiSpacer
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
index 000b019b3ee3..bf63f9ff8125 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.test.tsx
@@ -58,6 +58,7 @@ describe('Datasource Management: Edit Datasource Form', () => {
             existingDatasourceNamesList={existingDatasourceNamesList}
             onDeleteDataSource={mockFn}
             handleSubmit={mockFn}
+            displayToastMessage={mockFn}
           />
         ),
         {
@@ -229,6 +230,7 @@ describe('Datasource Management: Edit Datasource Form', () => {
             existingDatasourceNamesList={existingDatasourceNamesList}
             onDeleteDataSource={mockFn}
             handleSubmit={mockFn}
+            displayToastMessage={mockFn}
           />
         ),
         {
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
index 00c205fa1ade..bda8709cf509 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
@@ -29,6 +29,7 @@ import {
   credentialSourceOptions,
   DataSourceAttributes,
   DataSourceManagementContextValue,
+  ToastMessageItem,
   UsernamePasswordTypedContent,
 } from '../../../../types';
 import { context as contextType } from '../../../../../../opensearch_dashboards_react/public';
@@ -45,6 +46,7 @@ export interface EditDataSourceProps {
   existingDatasourceNamesList: string[];
   handleSubmit: (formValues: DataSourceAttributes) => void;
   onDeleteDataSource?: () => void;
+  displayToastMessage: (info: ToastMessageItem) => void;
 }
 export interface EditDataSourceState {
   formErrorsByField: CreateEditDataSourceValidation;
@@ -57,6 +59,7 @@ export interface EditDataSourceState {
   };
   showUpdatePasswordModal: boolean;
   showUpdateOptions: boolean;
+  isLoading: boolean;
 }
 
 export class EditDataSourceForm extends React.Component<EditDataSourceProps, EditDataSourceState> {
@@ -81,6 +84,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
       },
       showUpdatePasswordModal: false,
       showUpdateOptions: false,
+      isLoading: false,
     };
   }
 
@@ -208,7 +212,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
     });
   };
 
-  onClickUpdateDataSource = () => {
+  onClickUpdateDataSource = async () => {
     if (this.isFormValid()) {
       // update data source endpoint is currently not supported/allowed
       const formValues: DataSourceAttributes = {
@@ -225,7 +229,19 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
       }
 
       /* Submit */
-      this.props.handleSubmit(formValues);
+      this.setState({ isLoading: true });
+      try {
+        await this.props.handleSubmit(formValues, false);
+        this.setState({ showUpdateOptions: false });
+        this.setFormValuesForEditMode();
+      } catch (e) {
+        this.props.displayToastMessage({
+          id: 'dataSourcesManagement.editDataSource.editDataSourceFailMsg',
+          defaultMessage: 'Updating the Data Source failed with some errors.',
+        });
+      } finally {
+        this.setState({ isLoading: false });
+      }
     }
   };
 
@@ -247,7 +263,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
   };
 
   /* Update password */
-  updatePassword = (password: string) => {
+  updatePassword = async (password: string) => {
     const { title, description, auth } = this.props.existingDataSource;
     const updateAttributes: DataSourceAttributes = {
       title,
@@ -261,8 +277,21 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
         },
       },
     };
-    this.props.handleSubmit(updateAttributes);
     this.closePasswordModal();
+
+    try {
+      await this.props.handleSubmit(updateAttributes, true);
+      this.props.displayToastMessage({
+        id: 'dataSourcesManagement.editDataSource.updatePasswordSuccessMsg',
+        defaultMessage: 'Password updated successfully.',
+        success: true,
+      });
+    } catch (e) {
+      this.props.displayToastMessage({
+        id: 'dataSourcesManagement.editDataSource.updatePasswordFailMsg',
+        defaultMessage: 'Updating the stored password failed with some errors.',
+      });
+    }
   };
 
   /* Render methods */
@@ -426,44 +455,22 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
         </EuiText>
 
         <EuiHorizontalRule margin="m" />
-
-        <EuiDescribedFormGroup
-          title={
-            <h4>
-              {
-                <FormattedMessage
-                  id="dataSourcesManagement.editDataSource.endpointTitle"
-                  defaultMessage="Endpoint"
-                />
-              }
-            </h4>
-          }
-          description={
-            <p>
-              {
-                <FormattedMessage
-                  id="dataSourcesManagement.editDataSource.endpointDescription"
-                  defaultMessage="This connection information is used for reference in tables and when adding to a data source connection"
-                />
-              }
-            </p>
-          }
+        {/* Endpoint */}
+        <EuiFormRow
+          fullWidth={true}
+          label={i18n.translate('dataSourcesManagement.editDataSource.endpointURL', {
+            defaultMessage: 'Endpoint URL',
+          })}
         >
-          {/* Endpoint */}
-          <EuiFormRow
-            label={i18n.translate('dataSourcesManagement.editDataSource.endpointURL', {
-              defaultMessage: 'Endpoint URL',
-            })}
-          >
-            <EuiFieldText
-              name="endpoint"
-              value={this.props.existingDataSource.endpoint}
-              disabled={true}
-              aria-disabled={true}
-              data-test-subj="editDatasourceEndpointField"
-            />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
+          <EuiFieldText
+            name="endpoint"
+            value={this.props.existingDataSource.endpoint}
+            disabled={true}
+            fullWidth={true}
+            aria-disabled={true}
+            data-test-subj="editDatasourceEndpointField"
+          />
+        </EuiFormRow>
       </EuiPanel>
     );
   };
@@ -653,6 +660,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
               fill
               size="s"
               iconType="check"
+              isLoading={this.state.isLoading}
               onClick={this.onClickUpdateDataSource}
               data-test-subj="datasource-edit-saveButton"
             >
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.test.tsx b/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.test.tsx
index d8bd006f9dc1..d11f8c8bc9da 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.test.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.test.tsx
@@ -103,7 +103,7 @@ describe('Datasource Management: Edit Datasource Wizard', () => {
       expect(history.push).toBeCalledWith('');
     });
     test('should fail to update datasource', async () => {
-      spyOn(utils, 'updateDataSourceById').and.throwError('error');
+      spyOn(utils, 'updateDataSourceById').and.returnValue(new Error(''));
       await act(async () => {
         // @ts-ignore
         await component.find(formIdentifier).first().prop('handleSubmit')(
diff --git a/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.tsx b/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.tsx
index 24e6448df35a..a0d485c2f6cf 100644
--- a/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.tsx
+++ b/src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.tsx
@@ -51,49 +51,48 @@ export const EditDataSource: React.FunctionComponent<RouteComponentProps<{ id: s
   /* Fetch data source by id*/
   useEffectOnce(() => {
     (async function () {
-      setIsLoading(true);
-      try {
-        const fetchDataSourceById = await getDataSourceById(dataSourceID, savedObjects.client);
-        const listOfDataSources: DataSourceTableItem[] = await getDataSources(savedObjects.client);
-        if (fetchDataSourceById) {
-          setDataSource(fetchDataSourceById);
-          setBreadcrumbs(getEditBreadcrumbs(fetchDataSourceById));
-        }
-        if (Array.isArray(listOfDataSources) && listOfDataSources.length) {
-          setExistingDatasourceNamesList(
-            listOfDataSources.map((datasource) => datasource.title?.toLowerCase())
-          );
-        }
-      } catch (e) {
-        setDataSource(defaultDataSource);
-        handleDisplayToastMessage({
-          id: 'dataSourcesManagement.editDataSource.editDataSourceFailMsg',
-          defaultMessage: 'Unable to find the Data Source.',
-        });
-        props.history.push('');
-      } finally {
-        setIsLoading(false);
-      }
+      await fetchDataSourceDetailsByID();
     })();
   });
 
-  /* Handle submit - create data source*/
-  const handleSubmit = async (attributes: DataSourceAttributes) => {
+  const fetchDataSourceDetailsByID = async () => {
     setIsLoading(true);
     try {
-      await updateDataSourceById(savedObjects.client, dataSourceID, attributes);
-      props.history.push('');
+      const fetchDataSourceById = await getDataSourceById(dataSourceID, savedObjects.client);
+      const listOfDataSources: DataSourceTableItem[] = await getDataSources(savedObjects.client);
+      if (fetchDataSourceById) {
+        setDataSource(fetchDataSourceById);
+        setBreadcrumbs(getEditBreadcrumbs(fetchDataSourceById));
+      }
+      if (Array.isArray(listOfDataSources) && listOfDataSources.length) {
+        setExistingDatasourceNamesList(
+          listOfDataSources.map((datasource) => datasource.title?.toLowerCase())
+        );
+      }
     } catch (e) {
-      setIsLoading(false);
+      setDataSource(defaultDataSource);
       handleDisplayToastMessage({
         id: 'dataSourcesManagement.editDataSource.editDataSourceFailMsg',
-        defaultMessage: 'Updating the Data Source failed with some errors. Please try it again.',
+        defaultMessage: 'Unable to find the Data Source.',
       });
+      props.history.push('');
+    } finally {
+      setIsLoading(false);
     }
   };
 
-  const handleDisplayToastMessage = ({ id, defaultMessage }: ToastMessageItem) => {
-    toasts.addWarning(i18n.translate(id, { defaultMessage }));
+  /* Handle submit - create data source*/
+  const handleSubmit = async (attributes: DataSourceAttributes) => {
+    await updateDataSourceById(savedObjects.client, dataSourceID, attributes);
+    await fetchDataSourceDetailsByID();
+  };
+
+  const handleDisplayToastMessage = ({ id, defaultMessage, success }: ToastMessageItem) => {
+    if (success) {
+      toasts.addSuccess(i18n.translate(id, { defaultMessage }));
+    } else {
+      toasts.addWarning(i18n.translate(id, { defaultMessage }));
+    }
   };
 
   /* Handle delete - data source*/
@@ -124,6 +123,7 @@ export const EditDataSource: React.FunctionComponent<RouteComponentProps<{ id: s
             existingDatasourceNamesList={existingDatasourceNamesList}
             onDeleteDataSource={handleDelete}
             handleSubmit={handleSubmit}
+            displayToastMessage={handleDisplayToastMessage}
           />
         ) : null}
         {isLoading || !dataSource?.endpoint ? <LoadingMask /> : null}
diff --git a/src/plugins/data_source_management/public/types.ts b/src/plugins/data_source_management/public/types.ts
index a689cb4a593e..fe52466df1e5 100644
--- a/src/plugins/data_source_management/public/types.ts
+++ b/src/plugins/data_source_management/public/types.ts
@@ -42,6 +42,7 @@ export interface DataSourceTableItem {
 export interface ToastMessageItem {
   id: string;
   defaultMessage: string;
+  success?: boolean;
 }
 
 export type DataSourceManagementContextValue = OpenSearchDashboardsReactContextValue<