diff --git a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
index 5b0c0577489..3eca4a78b43 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
@@ -583,9 +583,9 @@ class CsIP:
                         CsPasswdSvc(self.address['public_ip']).stop()
                 elif cmdline.is_master():
                     if method == "add":
-                        CsPasswdSvc(self.address['gateway'] + "," + self.address['public_ip']).start()
+                        CsPasswdSvc(self.get_gateway() + "," + self.address['public_ip']).start()
                     elif method == "delete":
-                        CsPasswdSvc(self.address['gateway'] + "," + self.address['public_ip']).stop()
+                        CsPasswdSvc(self.get_gateway() + "," + self.address['public_ip']).stop()
 
         if self.get_type() == "public" and self.config.is_vpc() and method == "add":
             if self.address["source_nat"]:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 08f6f203f43..16d20c109ec 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -22,6 +22,8 @@ FROM ubuntu:16.04
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
 LABEL Vendor="Apache.org" License="ApacheV2" Version="4.14.0.0-SNAPSHOT"
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get -y update && apt-get install -y \
     genisoimage \
     libffi-dev \
@@ -37,18 +39,12 @@ RUN apt-get -y update && apt-get install -y \
     python-mysql.connector \
     supervisor
 
-RUN echo 'mysql-server mysql-server/root_password password root' |  debconf-set-selections; \
-    echo 'mysql-server mysql-server/root_password_again password root' |  debconf-set-selections;
-
 RUN apt-get install -qqy mysql-server && \
     apt-get clean all && \
     mkdir /var/run/mysqld; \
     chown mysql /var/run/mysqld
 
 RUN echo '''sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"''' >> /etc/mysql/mysql.conf.d/mysqld.cnf
-RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
-
-#RUN pip install --allow-external mysql-connector-python mysql-connector-python
 
 COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY . ./root
@@ -56,13 +52,16 @@ WORKDIR /root
 
 RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
 
-RUN (/usr/bin/mysqld_safe &); \
+RUN find /var/lib/mysql -type f -exec touch {} \; && \
+    (/usr/bin/mysqld_safe &) && \
     sleep 5; \
     mvn -Pdeveloper -pl developer -Ddeploydb; \
     mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
     MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \
     pip install $MARVIN_FILE
 
+VOLUME /var/lib/mysql
+
 EXPOSE 8080 8096
 
 CMD ["/usr/bin/supervisord"]