diff --git a/Dockerfile b/Dockerfile
index 6837854..43bbec8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ RUN pip install -r requirements.txt
 
 # copy project
 COPY . .
-ENTRYPOINT ["/usr/src/app/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/usr/src/app/entrypoint.sh", "--user"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4f3f7f1..22e96bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  web:
+  smtp-gateway:
     build: .
     expose:
       - "8081"
diff --git a/main.py b/main.py
index 18cd383..1fe6c87 100644
--- a/main.py
+++ b/main.py
@@ -25,7 +25,7 @@ class SMTPWebhookApp:
             req_body = json.loads(rawbody)
             subject = req_body['subject']
             body = req_body['body']
-            client = smtplib.SMTP(SERVER_NAME)
+            client = smtplib.SMTP(host=SERVER_HOST, port=SERVER_PORT)
             msg = MIMEText(body, 'plain', 'utf-8')
             msg['Subject'] = Header(subject, 'utf-8')
             msg['From'] = FROM_MAIL
@@ -53,16 +53,14 @@ ROOT = SMTPWebhookApp()
 
 if __name__ == "__main__":
     try:
-        SERVER_NAME = os.environ["server_name"]
+        SERVER_HOST = os.environ["server_host"]
+        SERVER_PORT = os.environ["server_port"]
         TO_MAIL = os.environ["to_mail"]
         FROM_MAIL = os.environ["from_mail"]
         FROM_MAIL_PASSWORD = os.environ["from_mail_password"]
-        # to_mail = "test111@mailinator.com"
-        # from_mail = "test@gmail.com"
-        # from_mail_password = "test@123"
     except KeyError:
-        raise "Please check missing environment variables: to_mail, from_mail, \
-            from_mail_password"
+        raise KeyError("Please check missing environment variables: to_mail, "
+                       "from_mail, from_mail_password")
 
     cherrypy.server.socket_host = "0.0.0.0"
     cherrypy.server.socket_port = 8081