diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..91be243c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+vendor
+node_modules
diff --git a/Dockerfile b/Dockerfile
index a6a73f12..cb811351 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM php:7
-RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev
+FROM php:7.1.3
+RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev netcat mysql-client
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN docker-php-ext-install pdo pdo_mysql zip
 WORKDIR /app
@@ -8,6 +8,5 @@ RUN composer install
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-
-CMD /usr/local/bin/wait.sh && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000
diff --git a/docker-compose.yml b/docker-compose.yml
index e7aa352c..48d64a54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,5 @@
-version: '2'
+version: '3'
 services:
-  app:
-    build: .
-    ports:
-      - "8000:8000"
-    volumes:
-      - .:/app
-    env_file: .env
-    working_dir: /app
-    command: bash -c 'sh /usr/local/bin/wait.sh && php artisan migrate && php artisan db:seed && php artisan serve --host 0.0.0.0'
-    depends_on:
-      - mysql
-    links:
-      - mysql
   mysql:
     build:
       context: ./docker/mysql
@@ -30,6 +17,20 @@ services:
     ports:
       - "3306:3306"
 
+  app:
+    build: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/app
+    env_file: .env
+    working_dir: /app
+    depends_on:
+      - mysql
+    links:
+      - mysql
+
+
   phpmyadmin:
     depends_on:
       - mysql
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index daef674b..27d6e340 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -98,7 +98,9 @@ export default {
       if(store.getters['auth/user'].role === 'admin'){
         this.$router.push({ name: 'admin.home' })
       }
-      this.$router.push({ name: 'home' })
+      else{
+        this.$router.push({ name: 'home' })
+      }
     }
   }
 }
diff --git a/wait.sh b/wait.sh
index ee7909a3..60ec0044 100644
--- a/wait.sh
+++ b/wait.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+HOST="mysql"
+PORT="3306"
+USER="default"
+PASSWORD="secret"
+DATABASE="default"
+
 echo "Waiting for mysql"
-until mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" &> /dev/null
+until nc -w 1 -z mysql 3306 &> /dev/null
 do
   printf "."
   sleep 1