diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5754d815..61281a95 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Spoony Android
-* @SOPT-all/35-APPJAM-ANDROID-SPOONY
\ No newline at end of file
+* @spooooony/android-spoony
diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt
index 8a601b11..a8b5dee4 100644
--- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt
+++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -38,6 +37,7 @@ import com.spoony.spoony.core.designsystem.component.textfield.SpoonyLineTextFie
 import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme
 import com.spoony.spoony.core.designsystem.type.ButtonStyle
 import com.spoony.spoony.core.util.extension.addFocusCleaner
+import com.spoony.spoony.core.util.extension.advancedImePadding
 import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MAX_DETAIL_REVIEW_LENGTH
 import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MAX_ONE_LINE_REVIEW_LENGTH
 import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MIN_DETAIL_REVIEW_LENGTH
@@ -72,6 +72,7 @@ fun RegisterStepTwoScreen(
         modifier = modifier
             .fillMaxSize()
             .addFocusCleaner(focusManager)
+            .advancedImePadding()
             .verticalScroll(rememberScrollState())
             .padding(top = 22.dp, bottom = 17.dp, start = 20.dp, end = 20.dp)
     ) {
@@ -98,11 +99,8 @@ fun RegisterStepTwoScreen(
             onPhotosSelected = viewModel::updatePhotos
         )
 
-        Spacer(
-            modifier = Modifier
-                .weight(1f)
-                .defaultMinSize(24.dp)
-        )
+        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(24.dp))
 
         NextButton(
             enabled = isNextButtonEnabled,
diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/component/SearchResultItem.kt b/app/src/main/java/com/spoony/spoony/presentation/register/component/SearchResultItem.kt
index d3412452..a271dd6b 100644
--- a/app/src/main/java/com/spoony/spoony/presentation/register/component/SearchResultItem.kt
+++ b/app/src/main/java/com/spoony/spoony/presentation/register/component/SearchResultItem.kt
@@ -47,7 +47,9 @@ fun SearchResultItem(
         Row(
             verticalAlignment = Alignment.Top,
             horizontalArrangement = Arrangement.Start,
-            modifier = Modifier.padding(vertical = 10.dp)
+            modifier = Modifier
+                .padding(vertical = 10.dp)
+                .weight(1f)
         ) {
             Icon(
                 imageVector = ImageVector.vectorResource(id = R.drawable.ic_pin_24),