diff --git a/.changeset/til-checkbox-fix.md b/.changeset/til-checkbox-fix.md
new file mode 100644
index 0000000000..c56b8f67a1
--- /dev/null
+++ b/.changeset/til-checkbox-fix.md
@@ -0,0 +1,5 @@
+---
+"@cloudoperators/juno-ui-components": patch
+---
+
+fix(ui): align Checkbox vertically in flex rows
diff --git a/.gitignore b/.gitignore
index 485b1bbafe..a5dfa08020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ act_*.json
 .out-of-code-insights
 .claude
 claude.md
+.husky/prepare-commit-msg
diff --git a/packages/ui-components/src/components/Checkbox/Checkbox.component.tsx b/packages/ui-components/src/components/Checkbox/Checkbox.component.tsx
index 7afc19bf43..d1de0965f1 100644
--- a/packages/ui-components/src/components/Checkbox/Checkbox.component.tsx
+++ b/packages/ui-components/src/components/Checkbox/Checkbox.component.tsx
@@ -28,8 +28,8 @@ const wrapperStyles = `
 
 const inputstyles = (disabled: boolean): string => {
   return `
-    jn:w-4
-    jn:h-4
+    jn:absolute
+    jn:inset-0
     jn:opacity-0
     jn:z-50
     ${disabled ? "jn:cursor-not-allowed" : "jn:cursor-pointer"}
@@ -93,7 +93,6 @@ const successstyles = `
 `
 
 const labelStyles = `
-  jn:leading-0
   jn:ml-2
 `
 
@@ -235,7 +234,7 @@ export const Checkbox = ({
   const theId = id || uniqueId()
 
   return (
-    <div className="jn-checkbox-outer">
+    <div className="jn-checkbox-outer jn:inline-flex jn:flex-col">
       <div className={`jn-checkbox-wrapper ${wrapperStyles}`}>
         <div
           className={`
diff --git a/packages/ui-components/src/components/CheckboxGroup/CheckboxGroup.component.tsx b/packages/ui-components/src/components/CheckboxGroup/CheckboxGroup.component.tsx
index 0f976baf8e..306d0e0dca 100644
--- a/packages/ui-components/src/components/CheckboxGroup/CheckboxGroup.component.tsx
+++ b/packages/ui-components/src/components/CheckboxGroup/CheckboxGroup.component.tsx
@@ -18,6 +18,8 @@ const groupstyles = `
   jn:rounded
   jn:border
   jn:py-1
+  jn:flex
+  jn:flex-col
 `
 
 const defaultgroupstyles = `
diff --git a/packages/ui-components/src/components/DataGridCell/DataGridCell.component.tsx b/packages/ui-components/src/components/DataGridCell/DataGridCell.component.tsx
index a2fef688d6..e73d0d15ac 100644
--- a/packages/ui-components/src/components/DataGridCell/DataGridCell.component.tsx
+++ b/packages/ui-components/src/components/DataGridCell/DataGridCell.component.tsx
@@ -15,7 +15,7 @@ const cellBaseStyles = (nowrap: boolean, cellVerticalAlignment: CellVerticalAlig
         ? `
 				jn:justify-center
 				jn:flex
-				jn:flex-col		
+				jn:flex-col
 			`
         : ""
     }
diff --git a/packages/ui-components/src/components/DataGridCheckboxCell/DataGridCheckboxCell.component.tsx b/packages/ui-components/src/components/DataGridCheckboxCell/DataGridCheckboxCell.component.tsx
index 3c8f858eb9..1795765a57 100644
--- a/packages/ui-components/src/components/DataGridCheckboxCell/DataGridCheckboxCell.component.tsx
+++ b/packages/ui-components/src/components/DataGridCheckboxCell/DataGridCheckboxCell.component.tsx
@@ -21,7 +21,7 @@ export const DataGridCheckboxCell = ({
   ...props
 }: DataGridCheckboxCellProps): ReactNode => {
   return (
-    <DataGridCell className={`juno-datagrid-checkbox-cell ${className}`} {...props}>
+    <DataGridCell className={`juno-datagrid-checkbox-cell jn:items-center ${className}`} {...props}>
       <Checkbox disabled={disabled} checked={selected} onChange={onChange} />
     </DataGridCell>
   )