diff --git a/apps/notification/.env b/apps/notification/.env
index 04c30f2..2403990 100644
--- a/apps/notification/.env
+++ b/apps/notification/.env
@@ -5,7 +5,7 @@ export CONTAINER_APP_ROOT=/app
 export LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME
 export BACKEND_LOG_FILE_NAME=$APP_NAME
 export APPLICATION_ACTIVITY_LOG=$APP_NAME-activity
-export SENDGRID_API_KEY='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'
+export SENDGRID_API_KEY=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
 export EMAIL_FROM=freeleaps@freeleaps.com
 export TWILIO_ACCOUNT_SID=ACf8c9283a6acda060258eadb29be58bc8
 export TWILIO_AUTH_TOKEN=ef160748cc22c8b7195b49df4b8eca7e
diff --git a/apps/notification/Dockerfile b/apps/notification/Dockerfile
index 2268ab8..f88b8bc 100644
--- a/apps/notification/Dockerfile
+++ b/apps/notification/Dockerfile
@@ -1,33 +1,33 @@
 FROM python:3.10-slim-buster
 
 # docker settings
-ARG CONTAINER_APP_ROOT=
-ENV APP_NAME=
+ARG CONTAINER_APP_ROOT=/app
+ENV APP_NAME=notification
 
 
 #site_settings
 ENV SERVICE_API_ACCESS_HOST=0.0.0.0
 ENV SERVICE_API_ACCESS_PORT=8003
-ENV RABBITMQ_HOST=
-ENV RABBITMQ_PORT=
+ENV RABBITMQ_HOST=localhost
+ENV RABBITMQ_PORT=5672
 
-ENV SYSTEM_USER_ID=
-ENV SMS_FROM=
-ENV EMAIL_FROM=
+ENV SYSTEM_USER_ID=117f191e810c19729de860aa
+ENV SMS_FROM=+16898887156
+ENV EMAIL_FROM=freeleaps@freeleaps.com
 
-ENV SECRET_KEY=
+ENV SECRET_KEY=ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0
 
-ENV SENDGRID_API_KEY=
+ENV SENDGRID_API_KEY=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
 
-ENV TWILIO_ACCOUNT_SID=
-ENV TWILIO_AUTH_TOKEN=
+ENV TWILIO_ACCOUNT_SID=ACf8c9283a6acda060258eadb29be58bc8
+ENV TWILIO_AUTH_TOKEN=ef160748cc22c8b7195b49df4b8eca7e
 
 
 
 #log_settings
-ENV LOG_BASE_PATH=
-ENV BACKEND_LOG_FILE_NAME=
-ENV APPLICATION_ACTIVITY_LOG=
+ENV LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME
+ENV BACKEND_LOG_FILE_NAME=$APP_NAME
+ENV APPLICATION_ACTIVITY_LOG=$APP_NAME-activity
 
 
 WORKDIR ${CONTAINER_APP_ROOT}
diff --git a/sites/notification/deploy/common/.env b/sites/notification/deploy/common/.env
index 6678b1b..b5869be 100755
--- a/sites/notification/deploy/common/.env
+++ b/sites/notification/deploy/common/.env
@@ -4,7 +4,7 @@ export CONTAINER_APP_ROOT=/app
 export LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME
 export BACKEND_LOG_FILE_NAME=$APP_NAME
 export APPLICATION_ACTIVITY_LOG=$APP_NAME-activity
-export SENDGRID_API_KEY='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'
+export SENDGRID_API_KEY=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
 export EMAIL_FROM=freeleaps@freeleaps.com
 export TWILIO_ACCOUNT_SID=ACf8c9283a6acda060258eadb29be58bc8
 export TWILIO_AUTH_TOKEN=ef160748cc22c8b7195b49df4b8eca7e