diff --git a/addons/rose/addon/styles/hds/overrides.scss b/addons/rose/addon/styles/hds/overrides.scss
index 52d77deb5..34d0fe793 100644
--- a/addons/rose/addon/styles/hds/overrides.scss
+++ b/addons/rose/addon/styles/hds/overrides.scss
@@ -4,11 +4,17 @@
  */
 
 // field bottom margin (HDS leaves this to implementers)
-[class^='hds-form-field'],
-[class^='hds-form-group'],
-[class^='hds-button-set'] {
+[class*='hds-form-field--layout'],
+[class*='hds-form-group--layout'] {
   margin-bottom: 1.5rem;
 }
+
+.hds-button-set {
+  .hds-button {
+    margin-bottom: 1.5rem;
+  }
+}
+
 /* stylelint-disable selector-class-pattern */
 .hds-form-group__control-fields-wrapper {
   .hds-form-group__legend ~ & {
diff --git a/ui/admin/tests/e2e/helpers/boundary-ui.js b/ui/admin/tests/e2e/helpers/boundary-ui.js
index 5a2ea9ba2..deba9aaf0 100644
--- a/ui/admin/tests/e2e/helpers/boundary-ui.js
+++ b/ui/admin/tests/e2e/helpers/boundary-ui.js
@@ -256,7 +256,11 @@ exports.waitForSessionToBeVisible = async (page, targetName) => {
  * @param {string} targetName Name of the target associated with the session
  * @param {string} credentialName Name of the credentials to be added to the target
  */
-exports.addBrokeredCredentialsToTarget = async (page, targetName, credentialName) => {
+exports.addBrokeredCredentialsToTarget = async (
+  page,
+  targetName,
+  credentialName
+) => {
   await page
     .getByRole('navigation', { name: 'Resources' })
     .getByRole('link', { name: 'Targets' })
@@ -282,4 +286,4 @@ exports.addBrokeredCredentialsToTarget = async (page, targetName, credentialName
   ).toBeVisible();
   await page.getByRole('button', { name: 'Dismiss' }).click();
   await expect(page.getByRole('link', { name: credentialName })).toBeVisible();
-}
+};
diff --git a/ui/admin/tests/integration/components/info-field-test.js b/ui/admin/tests/integration/components/info-field-test.js
index 06cb87c5e..09dd6b547 100644
--- a/ui/admin/tests/integration/components/info-field-test.js
+++ b/ui/admin/tests/integration/components/info-field-test.js
@@ -41,9 +41,7 @@ module('Integration | Component | info-field', function (hooks) {
     );
     assert.dom('.info-field').isVisible();
     assert.dom('.info-field .hds-form-label').hasText('Type');
-    assert
-      .dom('.info-field .hds-form-helper-text:last-of-type')
-      .hasText('Description');
+    assert.dom('.info-field .hds-form-helper-text').hasText('Description');
     assert.dom('[data-test-icon="apple"]').isVisible();
     assert.dom('.info-field .hds-form-text-input').isVisible();
   });