diff --git a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts
index 83a1c9ae08..502e54db4d 100644
--- a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts
@@ -28,27 +28,12 @@ export class HuiHorizontalStackCard extends HuiStackCard {
         #root {
           display: flex;
           height: 100%;
+          gap: var(--horizontal-stack-card-gap, var(--stack-card-gap, 8px));
         }
         #root > * {
           flex: 1 1 0;
-          margin: var(
-            --horizontal-stack-card-margin,
-            var(--stack-card-margin, 0 4px)
-          );
           min-width: 0;
         }
-        #root[dir="ltr"] > *:first-child {
-          margin-left: 0;
-        }
-        #root[dir="ltr"] > *:last-child {
-          margin-right: 0;
-        }
-        #root[dir="rtl"] > *:first-child {
-          margin-right: 0;
-        }
-        #root[dir="rtl"] > *:last-child {
-          margin-left: 0;
-        }
       `,
     ];
   }
diff --git a/src/panels/lovelace/cards/hui-vertical-stack-card.ts b/src/panels/lovelace/cards/hui-vertical-stack-card.ts
index e4915feea8..f03b4524d4 100644
--- a/src/panels/lovelace/cards/hui-vertical-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-vertical-stack-card.ts
@@ -27,18 +27,7 @@ class HuiVerticalStackCard extends HuiStackCard {
           display: flex;
           flex-direction: column;
           height: 100%;
-        }
-        #root > * {
-          margin: var(
-            --vertical-stack-card-margin,
-            var(--stack-card-margin, 4px 0)
-          );
-        }
-        #root > *:first-child {
-          margin-top: 0;
-        }
-        #root > *:last-child {
-          margin-bottom: 0;
+          gap: var(--vertical-stack-card-gap, var(--stack-card-gap, 8px));
         }
       `,
     ];