diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
index a0b4c6e3628..003af485e89 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
@@ -28,35 +28,37 @@ class CsApp:
         self.ip = ip.get_ip_address()
         self.type = ip.get_type()
         self.fw = ip.fw
+        self.config = ip.config
 
 
 class CsApache(CsApp):
     """ Set up Apache """
 
     def remove(self):
-        file = "/etc/apache2/conf.d/vhost%s.conf" % self.dev
+        file = "/etc/apache2/sites-enabled/vhost-%s.conf" % self.dev
         if os.path.isfile(file):
             os.remove(file)
             CsHelper.service("apache2", "restart")
 
     def setup(self):
         CsHelper.copy_if_needed("/etc/apache2/vhostexample.conf",
-                                "/etc/apache2/conf.d/vhost%s.conf" % self.dev)
+                                "/etc/apache2/sites-enabled/vhost-%s.conf" % self.ip)
 
-        file = CsFile("/etc/apache2/conf.d/vhost%s.conf" % (self.dev))
+        file = CsFile("/etc/apache2/sites-enabled/vhost-%s.conf" % (self.ip))
         file.search("<VirtualHost.*:80>", "\t<VirtualHost %s:80>" % (self.ip))
         file.search("<VirtualHost.*:80>", "\t<VirtualHost %s:80>" % (self.ip))
         file.search("<VirtualHost.*:443>", "\t<VirtualHost %s:443>" % (self.ip))
         file.search("Listen .*:80", "Listen %s:80" % (self.ip))
         file.search("Listen .*:443", "Listen %s:443" % (self.ip))
-        file.search("ServerName.*", "\tServerName vhost%s.cloudinternal.com" % (self.dev))
+        file.search("ServerName.*", "\tServerName %s.%s" % (self.config.cl.get_type(), self.config.get_domain()))
         if file.is_changed():
             file.commit()
             CsHelper.service("apache2", "restart")
 
-        self.fw.append(["", "front",
-                        "-A INPUT -i %s -d %s/32 -p tcp -m tcp -m state --state NEW --dport 80 -j ACCEPT" % (self.dev, self.ip)
-                        ])
+        self.fw.append([
+            "", "front",
+            "-A INPUT -i %s -d %s/32 -p tcp -m tcp -m state --state NEW --dport 80 -j ACCEPT" % (self.dev, self.ip)
+        ])
 
 
 class CsPasswdSvc():
@@ -94,10 +96,13 @@ class CsDnsmasq(CsApp):
                         "-A INPUT -i %s -p udp -m udp --dport 67 -j ACCEPT" % self.dev
                         ])
 
-        self.fw.append(["", "front",
-                        "-A INPUT -i %s -d %s/32 -p udp -m udp --dport 53 -j ACCEPT" % (self.dev, self.ip)
-                        ])
+        if self.config.has_dns():
+            self.fw.append([
+                "", "front",
+                "-A INPUT -i %s -d %s/32 -p udp -m udp --dport 53 -j ACCEPT" % (self.dev, self.ip)
+            ])
 
-        self.fw.append(["", "front",
-                        "-A INPUT -i %s -d %s/32 -p tcp -m tcp --dport 53 -j ACCEPT" % (self.dev, self.ip)
-                        ])
+            self.fw.append([
+                "", "front",
+                "-A INPUT -i %s -d %s/32 -p tcp -m tcp --dport 53 -j ACCEPT" % (self.dev, self.ip)
+            ])