diff --git a/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java b/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java
index 147a512..1639ccf 100644
--- a/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java
+++ b/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java
@@ -1,12 +1,9 @@
 package com.capgemini.training.appointmentbooking;
 
-import com.capgemini.training.appointmentbooking.dataaccess.repository.impl.BaseJpaRepositoryImpl;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
-@EnableJpaRepositories(repositoryBaseClass = BaseJpaRepositoryImpl.class)
 public class AppointmentBookingAppApplication {
 
 	public static void main(String[] args) {
diff --git a/src/main/java/com/capgemini/training/appointmentbooking/dataaccess/config/DataaccessConfiguration.java b/src/main/java/com/capgemini/training/appointmentbooking/dataaccess/config/DataaccessConfiguration.java
new file mode 100644
index 0000000..9fbaceb
--- /dev/null
+++ b/src/main/java/com/capgemini/training/appointmentbooking/dataaccess/config/DataaccessConfiguration.java
@@ -0,0 +1,11 @@
+package com.capgemini.training.appointmentbooking.dataaccess.config;
+
+import com.capgemini.training.appointmentbooking.dataaccess.repository.impl.BaseJpaRepositoryImpl;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+@Configuration
+@EnableJpaRepositories(
+    repositoryBaseClass = BaseJpaRepositoryImpl.class,
+    basePackages = "com.capgemini.training.appointmentbooking.dataaccess.repository")
+public class DataaccessConfiguration {}
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/entity/EntitySmokeTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/entity/EntitySmokeTestIT.java
index 2286fa0..d12e94c 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/entity/EntitySmokeTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/entity/EntitySmokeTestIT.java
@@ -7,11 +7,15 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class EntitySmokeTestIT {
 
 	@PersistenceContext
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepositoryTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepositoryTestIT.java
index 2394673..becab6f 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepositoryTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepositoryTestIT.java
@@ -2,6 +2,7 @@
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
 import com.capgemini.training.appointmentbooking.common.datatype.AppointmentStatus;
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.AppointmentEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.ClientEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
@@ -10,6 +11,7 @@
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
@@ -19,6 +21,7 @@
 
 @Transactional
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class AppointmentRepositoryTestIT extends BaseTest {
 
     @Inject
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepositoryTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepositoryTestIT.java
index 6db7dcc..ce34fba 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepositoryTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepositoryTestIT.java
@@ -1,10 +1,12 @@
 package com.capgemini.training.appointmentbooking.dataaccess.repository;
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.ClientEntity;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -12,6 +14,7 @@
 
 @Transactional
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class ClientRepositoryTestIT extends BaseTest {
 
     @Inject
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepositoryTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepositoryTestIT.java
index 0aadcef..6fdd6e9 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepositoryTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepositoryTestIT.java
@@ -2,10 +2,12 @@
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
 import com.capgemini.training.appointmentbooking.common.datatype.Specialization;
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -13,6 +15,7 @@
 
 @Transactional
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class SpecialistRepositoryTestIT extends BaseTest {
 
     @Inject
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepositoryTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepositoryTestIT.java
index 86933ff..e69e804 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepositoryTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepositoryTestIT.java
@@ -2,12 +2,14 @@
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
 import com.capgemini.training.appointmentbooking.common.datatype.Specialization;
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.TreatmentEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.TreatmentCriteria;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -16,6 +18,7 @@
 
 @Transactional
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class TreatmentRepositoryTestIT extends BaseTest {
 
     @Inject
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/UserRepositoryTestIT.java b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/UserRepositoryTestIT.java
index 53f444a..f00e8f1 100644
--- a/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/UserRepositoryTestIT.java
+++ b/src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/UserRepositoryTestIT.java
@@ -1,11 +1,13 @@
 package com.capgemini.training.appointmentbooking.dataaccess.repository;
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
+import com.capgemini.training.appointmentbooking.dataaccess.config.DataaccessConfiguration;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.UserEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.UserCriteria;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -13,6 +15,7 @@
 
 @Transactional
 @DataJpaTest
+@Import(DataaccessConfiguration.class)
 public class UserRepositoryTestIT extends BaseTest {
 
     @Inject