diff --git a/docker-compose-test.yml b/docker-compose-test.yml
new file mode 100644
index 0000000..2d7d474
--- /dev/null
+++ b/docker-compose-test.yml
@@ -0,0 +1,26 @@
+version: "2"
+
+services:
+  #GLPI Container
+  glpi:
+   build: ./
+   image: myglpi
+   container_name : myglpi
+   ports:
+    - "9080:80"
+   links:
+    - mysql:mysql
+   restart: always
+   volumes:
+    - "/etc/timezone:/etc/timezone"
+    - "/etc/localtime:/etc/localtime"
+   environment:
+    TIMEZONE: Europe/Paris
+
+  #Mysql Container
+  mysql:
+   image: mysql
+   container_name: mysql
+   hostname: mysql
+   env_file:
+    - ./mysql.env
diff --git a/docker-compose.yml b/docker-compose.yml
index 65aeeef..03d50e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,36 +1,40 @@
+version: "2"
+
+services:
 #Mysql Persitance Data
-mysql-data:
- image: busybox
- container_name: mysql-data
- volumes:
-  - /var/lib/mysql:/var/lib/mysql
+  mysql-data:
+    image: busybox
+    container_name: mysql-data
+    volumes:
+      - /var/lib/mysql:/var/lib/mysql
 
 #Mysql Container
-mysql:
- image: mysql
- container_name: mysql
- hostname: mysql
- volumes_from:
-  - mysql-data
- env_file:
-  - ./mysql.env
+  mysql:
+    image: mysql
+    container_name: mysql
+    hostname: mysql
+    volumes_from:
+      - mysql-data
+    env_file:
+      - ./mysql.env
 
 #GLPI Pesitance Data
-glpi-data:
- image: busybox
- container_name: glpi-data
- volumes:
- - /var/www/html/glpi:/var/www/html/glpi
+  glpi-data:
+    image: busybox
+    container_name: glpi-data
+    volumes:
+      - /var/www/html/glpi:/var/www/html/glpi
 
 #GLPI Container
-glpi:
- image: diouxx/glpi
- container_name : glpi
- hostname: glpi
- ports:
-  - "80:80"
- links:
-  - mysql:mysql
- volumes_from:
- - glpi-data
- restart: always
+  glpi:
+    build: ./
+    image: myglpi
+    container_name : myglpi
+    hostname: glpi
+    ports:
+      - "80:80"
+    links:
+      - mysql:mysql
+    volumes_from:
+      - glpi-data
+    restart: always
diff --git a/glpi-start.sh b/glpi-start.sh
index 8659735..8fc5a47 100644
--- a/glpi-start.sh
+++ b/glpi-start.sh
@@ -4,6 +4,10 @@
 [[ ! "$VERSION_GLPI" ]] \
 	&& VERSION_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/latest | grep tag_name | cut -d '"' -f 4)
 
+if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset"; 
+else echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.0/apache2/conf.d/timezone.ini;
+fi
+
 SRC_GLPI="https://github.com/glpi-project/glpi/releases/download/${VERSION_GLPI}/glpi-${VERSION_GLPI}.tgz"
 TAR_GLPI=glpi-${VERSION_GLPI}.tgz
 FOLDER_GLPI=glpi/