diff --git a/src/main/java/com/brainpix/BrainpixApplication.java b/src/main/java/com/brainpix/BrainpixApplication.java
index c4512855..d2d4645f 100644
--- a/src/main/java/com/brainpix/BrainpixApplication.java
+++ b/src/main/java/com/brainpix/BrainpixApplication.java
@@ -6,8 +6,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.mongodb.config.EnableMongoAuditing;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 @SpringBootApplication
+@EnableMongoAuditing
+@EnableMongoRepositories(basePackages = {"com.brainpix.message.repository", "com.brainpix.alarm.repository"})
 public class BrainpixApplication {
 
 	@PostConstruct
diff --git a/src/main/java/com/brainpix/config/MongoConfig.java b/src/main/java/com/brainpix/config/MongoConfig.java
deleted file mode 100644
index cfcfef0c..00000000
--- a/src/main/java/com/brainpix/config/MongoConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.brainpix.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.config.EnableMongoAuditing;
-
-@Configuration
-@EnableMongoAuditing
-public class MongoConfig extends AbstractMongoClientConfiguration {
-	@Override
-	protected String getDatabaseName() {
-		return "brainpix";
-	}
-}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 508f070d..3fe00c4e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@ spring:
         format_sql: true
   data:
     mongodb:
-      uri: ENC(OyBqzmMmtLqk4kAhF/+3rGjN/7ZzE3gIHHBE5T7sfRK2fgj3L+xq26lIUmkJG4Aqa0gQ5i83l43yGpxOIuT56aQ098QukuiFAPYNVpSerxY=)
+      uri: ENC(ntZhfbWKkCOZNqOpRHvqXNo6dobNfFZ/Di5ttdUS2DYYcrgyKJ65WS2QwDANfHxaLz5oYrPgYOiEfRgtWSCq+Iz9sMKPumkayGCZRCGK+zrV4SjF0DHUHMgCWOjgiZJKJBbHxKbwdgwHHnNAJkYGixZMTy2fTp+5OJKFOMSn5Lb5Mz+UXFnMKfrIhnIV6HAjd8Lew8yry6npsHneBiXzlA==)
   mail:
     host: ENC(5WpWHIIQtBVAYDvxlhS3jjaEZXLMSQjIqO5kXPrLze/PM29RbHV3U8Z6ihG501qp)
     username: ENC(prCp5Ol/nxisuAB+sy7D1brjRQDnk1sArHFMZ1J310Q7O/DOed09i9OXAiZBSrh2Lae9pI7soUI6dxdpgcx3KA==)