diff --git a/docker-compose.yml b/docker-compose.yml
index 7f60f0f..ea4a213 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -166,11 +166,11 @@ services:
     mysql:
       build:
         context: ./mysql
-        args:
-          - MYSQL_DATABASE=${MYSQL_DATABASE}
-          - MYSQL_USER=${MYSQL_USER}
-          - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-          - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      environment:
+        - MYSQL_DATABASE=${MYSQL_DATABASE}
+        - MYSQL_USER=${MYSQL_USER}
+        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       volumes:
         - mysql:/var/lib/mysql
       ports:
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index b483cc2..e494b65 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -2,26 +2,10 @@ FROM mysql:5.7
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-ADD startup /etc/mysql/startup
-
 RUN chown -R mysql:root /var/lib/mysql/
 
-ARG MYSQL_DATABASE=default
-ARG MYSQL_USER=default
-ARG MYSQL_PASSWORD=secret
-ARG MYSQL_ROOT_PASSWORD=root
-
-ENV MYSQL_DATABASE=$MYSQL_DATABASE
-ENV MYSQL_USER=$MYSQL_USER
-ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
-ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
-
-RUN sed -i 's/MYSQL_DATABASE/'$MYSQL_DATABASE'/g' /etc/mysql/startup && \
-    sed -i 's/MYSQL_USER/'$MYSQL_USER'/g' /etc/mysql/startup && \
-    sed -i 's/MYSQL_PASSWORD/'$MYSQL_PASSWORD'/g' /etc/mysql/startup
-
 ADD my.cnf /etc/mysql/conf.d/my.cnf
 
-CMD ["mysqld", "--init-file=/etc/mysql/startup"]
+CMD ["mysqld"]
 
 EXPOSE 3306
diff --git a/mysql/startup b/mysql/startup
deleted file mode 100644
index 0a82f1d..0000000
--- a/mysql/startup
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP USER IF EXISTS 'MYSQL_USER'; 
-CREATE USER 'MYSQL_USER'@'%' IDENTIFIED BY 'MYSQL_PASSWORD'; 
-CREATE DATABASE IF NOT EXISTS `MYSQL_DATABASE`; 
-GRANT ALL ON `MYSQL_DATABASE`.* TO 'MYSQL_USER'@'%';