diff --git a/static/app/views/onboarding/components/scmFeatureCard.tsx b/static/app/views/onboarding/components/scmFeatureCard.tsx
index c9f337b01a51..ea0b7c293840 100644
--- a/static/app/views/onboarding/components/scmFeatureCard.tsx
+++ b/static/app/views/onboarding/components/scmFeatureCard.tsx
@@ -48,20 +48,20 @@ export function ScmFeatureCard({
     >
       <ScmSelectableContainer
         isSelected={isSelected}
-        padding={{xs: 'md', md: 'lg'}}
+        padding="lg"
         height="100%"
         borderCompensation={3}
       >
         <Flex align="start">
           <Grid
-            columns="min-content 1fr"
+            columns="min-content 1fr min-content"
             rows="min-content min-content"
-            gap={{xs: 'xs md', md: 'xs lg'}}
+            gap="xs lg"
             align="center"
             width="100%"
             areas={`
-                    "icon label"
-                    ". description"
+                    "icon label toggle"
+                    ". description ."
                   `}
           >
             <Container area="icon">
@@ -79,31 +79,34 @@ export function ScmFeatureCard({
                 {label}
               </Text>
             </Container>
-            <Container area="description">
+
+            <Flex area="toggle" align="start" gap="sm">
+              {isVolumeLoading ? (
+                <Placeholder height="22px" width="100px" />
+              ) : (
+                <Tooltip title={volumeTooltip} delay={100}>
+                  <Tag variant="muted" icon={<IconInfo size="sm" />}>
+                    {volume}
+                  </Tag>
+                </Tooltip>
+              )}
+
+              <Tooltip title={disabledReason} disabled={!disabledReason} delay={500}>
+                <Switch
+                  checked={isSelected}
+                  disabled={disabled}
+                  role="presentation"
+                  tabIndex={-1}
+                  readOnly
+                  size="sm"
+                />
+              </Tooltip>
+            </Flex>
+
+            <Container area="description" column="2 / -1">
               <Text variant="secondary">{description}</Text>
             </Container>
           </Grid>
-          <Flex align="start" gap="sm">
-            {isVolumeLoading ? (
-              <Placeholder height="22px" width="100px" />
-            ) : (
-              <Tooltip title={volumeTooltip} delay={100}>
-                <Tag variant="muted" icon={<IconInfo size="sm" />}>
-                  {volume}
-                </Tag>
-              </Tooltip>
-            )}
-            <Tooltip title={disabledReason} disabled={!disabledReason} delay={500}>
-              <Switch
-                checked={isSelected}
-                disabled={disabled}
-                role="presentation"
-                tabIndex={-1}
-                readOnly
-                size="sm"
-              />
-            </Tooltip>
-          </Flex>
         </Flex>
       </ScmSelectableContainer>
     </ScmCardButton>
diff --git a/static/app/views/onboarding/components/scmFeatureInfoCards.tsx b/static/app/views/onboarding/components/scmFeatureInfoCards.tsx
index 1a1ede0074a4..a6621698f236 100644
--- a/static/app/views/onboarding/components/scmFeatureInfoCards.tsx
+++ b/static/app/views/onboarding/components/scmFeatureInfoCards.tsx
@@ -70,7 +70,7 @@ export function ScmFeatureInfoCards({
               <Grid
                 columns="min-content 1fr"
                 rows="min-content min-content"
-                gap={{xs: 'xs md', sm: 'xs lg'}}
+                gap="xs lg"
                 align="center"
                 areas={`
                     "icon label"
diff --git a/static/app/views/onboarding/scmConnect.tsx b/static/app/views/onboarding/scmConnect.tsx
index 9af98d7b6f1f..96c4299a6233 100644
--- a/static/app/views/onboarding/scmConnect.tsx
+++ b/static/app/views/onboarding/scmConnect.tsx
@@ -184,7 +184,7 @@ export function ScmConnect({onComplete, genBackButton}: StepProps) {
           paddingTop="3xl"
         >
           <Flex align="center">{genBackButton?.()}</Flex>
-          <Flex align="center" gap="md">
+          <Flex align="center" gap="md" minWidth={0}>
             {!selectedRepository && (
               <Button
                 analyticsEventKey="onboarding.scm_connect_skip_clicked"
@@ -194,8 +194,11 @@ export function ScmConnect({onComplete, genBackButton}: StepProps) {
                 }}
                 onClick={() => onComplete()}
                 variant="transparent"
+                style={{minWidth: 0}}
               >
-                {t('Continue without a repo')}
+                <Text ellipsis variant="inherit">
+                  {t('Continue without a repo')}
+                </Text>
               </Button>
             )}