diff --git a/3.New_server_deployment/3.Proxy_settings/0_setup.py b/3.New_server_deployment/3.Proxy_settings/0_setup.py
index 38449921ba215d51af25860496475488d8c08114..1d820a9cba57f10bc2821c583da2474cf1fdc4c1 100644
--- a/3.New_server_deployment/3.Proxy_settings/0_setup.py
+++ b/3.New_server_deployment/3.Proxy_settings/0_setup.py
@@ -17,7 +17,12 @@ def setup(interactive=True):
         environment += 'http_proxy="%s"\n' % http_proxy
     if https_proxy:
         environment += 'https_proxy="%s"\n' % https_proxy
-    if no_proxy:
+    if http_proxy or https_proxy:
+        no_proxy = no_proxy + ',' if no_proxy else ''
+        no_proxy += 'localhost'
+        no_proxy += ',' + utils.get_conf('MS_SERVER_NAME', 'mediaserver')
+        no_proxy += ',' + utils.get_conf('MONITOR_SERVER_NAME', 'monitor')
+        no_proxy += ',' + utils.get_conf('CM_SERVER_NAME', 'campusmanager')
         environment += 'no_proxy="%s"\n' % no_proxy
     # apt
     apt_proxy_path = '/etc/apt/apt.conf.d/proxy'