diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 7cac60603..aa4dc0129 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -9,32 +9,37 @@ services:
         build:
             context: database/
             dockerfile: Dockerfile
-    php:
+
+    ospos:
         build:
             context: .
             dockerfile: Dockerfile.dev
-        links:
-            - mysql
+        container_name: ospos
+        restart: always
+        depends_on:
+          - mysql
         ports:
-            - "80:80"
+          - "80:80"
         volumes:
-            - .:/app
+          - .:/app
         environment:
-            - PHP_TIMEZONE=UTC
-            - MYSQL_USERNAME=admin
-            - MYSQL_PASSWORD=pointofsale
-            - MYSQL_DB_NAME=ospos
-            - MYSQL_HOST_NAME=mysql
-            - XDEBUG_CONFIG=remote_host=172.17.0.1
+          - PHP_TIMEZONE=UTC
+          - MYSQL_USERNAME=admin
+          - MYSQL_PASSWORD=pointofsale
+          - MYSQL_DB_NAME=ospos
+          - MYSQL_HOST_NAME=mysql
+          - XDEBUG_CONFIG=remote_host=172.17.0.1
 
     mysql:
         image: mariadb:10.1.21
-        environment:
-            - MYSQL_ROOT_PASSWORD=pointofsale
-            - MYSQL_DATABASE=ospos
-            - MYSQL_USER=admin
-            - MYSQL_PASSWORD=pointofsale
+        container_name: mysql
+        restart: always
         ports:
-            - "3306:3306"
+          - "3306:3306"
         volumes_from:
-            - sqlscript
+          - sqlscript
+        environment:
+          - MYSQL_ROOT_PASSWORD=pointofsale
+          - MYSQL_DATABASE=ospos
+          - MYSQL_USER=admin
+          - MYSQL_PASSWORD=pointofsale
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 3b5472ccd..eeba2eb3b 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -5,32 +5,38 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.test
+
     sqlscript:
         build:
             context: database/
             dockerfile: Dockerfile
-    php:
+
+    ospos:
         build:
             context: .
             dockerfile: Dockerfile
-        links:
-            - mysql
+        container_name: ospos
+        restart: always
+        depends_on:
+          - mysql
         ports:
-            - "80:80"
+          - "80:80"
         environment:
-            - MYSQL_USERNAME=admin
-            - MYSQL_PASSWORD=pointofsale
-            - MYSQL_DB_NAME=ospos
-            - MYSQL_HOST_NAME=mysql
+          - MYSQL_USERNAME=admin
+          - MYSQL_PASSWORD=pointofsale
+          - MYSQL_DB_NAME=ospos
+          - MYSQL_HOST_NAME=mysql
 
     mysql:
         image: mysql:5.7
-        environment:
-            - MYSQL_ROOT_PASSWORD=pointofsale
-            - MYSQL_DATABASE=ospos
-            - MYSQL_USER=admin
-            - MYSQL_PASSWORD=pointofsale
+        container_name: mysql
+        restart: always
         ports:
-            - "3306:3306"
+          - "3306:3306"
         volumes:
-            - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
+          - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
+        environment:
+          - MYSQL_ROOT_PASSWORD=pointofsale
+          - MYSQL_DATABASE=ospos
+          - MYSQL_USER=admin
+          - MYSQL_PASSWORD=pointofsale
diff --git a/docker/.env b/docker/.env
index ae6c747bf..f386cce81 100644
--- a/docker/.env
+++ b/docker/.env
@@ -4,7 +4,7 @@ OSPOS_MYSQL_ROOT_PASSWORD=ospos_mysql
 # Set a valid domain name if you use Letsencrypt
 OSPOS_DOMAIN_NAME=ospos.ospos
 # Set a valid email address if you use Letsencrypt
-OSPOS_CONTACT_EMAIL=admion@ospos.ospos
+OSPOS_CONTACT_EMAIL=admin@ospos.ospos
 # Set to 1 if you're testing your setup with Letsencrypt 
 # to avoid hitting request limits, otherwise set 0
 OSPOS_STAGING=1