diff --git a/src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java b/src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
index 4e2313a24d82b8ac11058e3bc38ec7988eb00268..b2f08fa859ea3f627c0508c6fcb96d37f99fd0fd 100644
--- a/src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
+++ b/src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
@@ -14,21 +14,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import tech.jhipster.config.DefaultProfileUtil;
 import tech.jhipster.config.JHipsterConstants;
 
 @SpringBootApplication
-@EnableJpaRepositories(includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = JpaRepository.class))
-@EnableElasticsearchRepositories(
-    includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ElasticsearchRepository.class)
-)
 @EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class })
 public class GitsearchApp {
 
diff --git a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
index 08b1051b134f3587b3c2651296f975219110e9b6..c63bf657e0e351362dc6a473840b3d9c73bb254f 100644
--- a/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
+++ b/src/main/java/at/ac/uibk/gitsearch/config/DatabaseConfiguration.java
@@ -15,9 +15,9 @@ import tech.jhipster.config.JHipsterConstants;
 import tech.jhipster.config.h2.H2ConfigurationHelper;
 
 @Configuration
-@EnableJpaRepositories("at.ac.uibk.gitsearch.repository")
 @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware")
 @EnableTransactionManagement
+@EnableJpaRepositories("at.ac.uibk.gitsearch.repository")
 @EnableElasticsearchRepositories("at.ac.uibk.gitsearch.repository.search")
 public class DatabaseConfiguration {