diff --git a/app/config/appConfig.js b/app/config/appConfig.js
index 288ee24..c56f93b 100644
--- a/app/config/appConfig.js
+++ b/app/config/appConfig.js
@@ -1,3 +1,6 @@
+"use strict";
+require("dotenv").config({ path: __dirname + "/./../../.env" });
+
 const APP_PORT = process.env.PORT || 5000;
 const APP_BASE_URL = process.env.APP_BASE_URL || "http://localhost";
 
@@ -11,10 +14,24 @@ const DEFAULT_TIMEZONE = "Europe/Sarajevo";
 const CRAWLER_INTERVAL = parseInt(process.env.CRAWLER_INTERVAL) || 60;
 const STOP_CRAWLER = !!parseInt(process.env.STOP_CRAWLER);
 
+const AWS_EMAIL_CONFIG = {
+  REGION: process.env.AWS_REGION || "",
+  CREDENTIALS: {
+    ACCESS_KEY_ID: process.env.AWS_KEY_ID || "",
+    SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || ""
+  },
+  SOURCE_EMAIL: process.env.SOURCE_EMAIL || ""
+};
+
+const MAX_REAL_ESTATES_IN_EMAIL =
+  parseInt(process.env.MAX_REAL_ESTATES_IN_EMAIL) || 10;
+
 module.exports = {
   APP_PORT,
   APP_URL,
   DEFAULT_TIMEZONE,
   CRAWLER_INTERVAL,
-  STOP_CRAWLER
+  STOP_CRAWLER,
+  AWS_EMAIL_CONFIG,
+  MAX_REAL_ESTATES_IN_EMAIL
 };
diff --git a/app/crawler/crawlerConfig.js b/app/crawler/crawlerConfig.js
index eb9133a..eac99c6 100644
--- a/app/crawler/crawlerConfig.js
+++ b/app/crawler/crawlerConfig.js
@@ -1,5 +1,5 @@
 "use strict";
-require("dotenv").config({ path: "../../.env" });
+require("dotenv").config({ path: __dirname + "/./../../.env" });
 const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../common/enums");
 
 const olxCrawlerAdType =
diff --git a/development.env b/development.env
index 480f5a5..6368ee7 100644
--- a/development.env
+++ b/development.env
@@ -8,9 +8,12 @@ SEQUELIZE_LOGGING=0- no sequelize logging, 1- log to the console
 PORT=Port for the app, defaults to 5000
 APP_BASE_URL=base url for the app
 
-AMAZON_ACCES_KEY_ID=(your-key-here)
-AMAZON_SECRET_ACCESS_KEY=(your-key-here)
-AMAZON_REGION=eu-west-1
+MAX_REAL_ESTATES_IN_EMAIL=Number of real estates that will be shown in URL, others will be truncated and URL with full list will be shwon
+
+AWS_KEY_ID=(your-key-here)
+AWS_SECRET_ACCESS_KEY=(your-key-here)
+AWS_REGION=eu-west-1
+
 APP_URL=http://localhost:3001
 SOURCE_EMAIL=info@saburly.com