diff --git a/src/main/resources/templates/ActivityTemplate.txt b/src/main/resources/templates/ActivityTemplate.txt
index 2be1bc7..7d4bc23 100644
--- a/src/main/resources/templates/ActivityTemplate.txt
+++ b/src/main/resources/templates/ActivityTemplate.txt
@@ -1,15 +1,28 @@
 package $PACKAGE$
 
+import androidx.lifecycle.LifecycleOwner
 import kr.co.finda.finda.R
 import kr.co.finda.finda.databinding.Activity$NAME$Binding
-import kr.co.finda.finda.ui.base.BaseActivity
+import kr.co.finda.finda.ui.base.v2.BaseActivityV2
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class $NAME$Activity : BaseActivity<Activity$NAME$Binding, $NAME$ViewModel>(
-    R.layout.$LAYOUT_NAME$,
-    $NAME$ViewModel::class.java
+
+class $NAME$Activity : BaseActivityV2<Activity$NAME$Binding, $NAME$ViewModel>(
+    R.layout.$LAYOUT_NAME$
 ) {
 
-    override fun setBindingVariables() {
+    override val viewModel: $NAME$ViewModel by viewModel()
+
+    override fun onInitialize(lifecycleOwner: LifecycleOwner) {
+        super.onInitialize(lifecycleOwner)
         binding.viewModel = viewModel
     }
+
+    override fun setupUiComponent() {
+
+    }
+
+    override fun observeLiveData() {
+
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/FragmentTemplate.txt b/src/main/resources/templates/FragmentTemplate.txt
index 6abcc3d..653369b 100644
--- a/src/main/resources/templates/FragmentTemplate.txt
+++ b/src/main/resources/templates/FragmentTemplate.txt
@@ -1,15 +1,27 @@
 package $PACKAGE$
 
+import androidx.lifecycle.LifecycleOwner
 import kr.co.finda.finda.R
 import kr.co.finda.finda.databinding.Fragment$NAME$Binding
-import kr.co.finda.finda.ui.base.BaseFragment
+import kr.co.finda.finda.ui.base.v2.BaseFragmentV2
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class $NAME$Fragment : BaseFragment<Fragment$NAME$Binding, $NAME$ViewModel>(
-    R.layout.$LAYOUT_NAME$,
-    $NAME$ViewModel::class.java
+class $NAME$Fragment : BaseFragment<Fragment$NAME$Binding>(
+    R.layout.$LAYOUT_NAME$
 ) {
 
-    override fun setBindingVariables() {
-        binding.viewModel = viewModel
-    }
+     override val viewModel: $NAME$ViewModel by sharedViewModel()
+
+        override fun onInitialize(lifecycleOwner: LifecycleOwner) {
+            super.onInitialize(lifecycleOwner)
+            binding.viewModel = viewModel
+        }
+
+        override fun setupUiComponent() {
+
+        }
+
+        override fun observeLiveData() {
+
+        }
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/LayoutTemplate.txt b/src/main/resources/templates/LayoutTemplate.txt
index fb85698..c9f2e6c 100644
--- a/src/main/resources/templates/LayoutTemplate.txt
+++ b/src/main/resources/templates/LayoutTemplate.txt
@@ -9,7 +9,7 @@
             type="$VM_PACKAGE$" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/src/main/resources/templates/ViewModelTemplate.txt b/src/main/resources/templates/ViewModelTemplate.txt
index 6920007..40a5ba2 100644
--- a/src/main/resources/templates/ViewModelTemplate.txt
+++ b/src/main/resources/templates/ViewModelTemplate.txt
@@ -1,8 +1,8 @@
 package $PACKAGE$
 
-import kr.co.finda.finda.coreComponent.ui.base.BaseViewModel
+import kr.co.finda.finda.ui.base.v2.BaseViewModelV2
 
-class $NAME$ViewModel : BaseViewModel() {
+class $NAME$ViewModel : BaseViewModelV2() {
 
 
 }
\ No newline at end of file