diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml
index 8a0257fd5..24b0e59b2 100644
--- a/roles/1-prep/tasks/computed_vars.yml
+++ b/roles/1-prep/tasks/computed_vars.yml
@@ -53,6 +53,10 @@
       value: '{{ ansible_product_uuid }}'
 
 # Put all computed vars here so derive properly from any prior var file
+- name: If the TZ is not set in env, set it to UTC
+  set_fact: local_tz='UTC'
+  when: local_tz == ""
+
 - name: Set port 80 for Admin Console
   set_fact:
     gui_port: 80
diff --git a/roles/elgg/defaults/main.yml b/roles/elgg/defaults/main.yml
index 8a617ccb4..933f6fc6e 100644
--- a/roles/elgg/defaults/main.yml
+++ b/roles/elgg/defaults/main.yml
@@ -8,7 +8,6 @@ elgg_install: True
 elgg_enabled: False
 
 # following variables used in elgg engine/settings.php template
-timezone: America/New_York
 dbuser: Admin
 dbpassword: changeme
 dbname: elggdb
diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml
index 3628742b9..ffce75615 100644
--- a/roles/elgg/tasks/main.yml
+++ b/roles/elgg/tasks/main.yml
@@ -53,10 +53,6 @@
         - localhost
   when: mysql_enabled and elgg_enabled
 
-- name: If the TZ is not set in env, set it to UTC
-  set_fact: local_tz='UTC'
-  when: local_tz == ""
-
 # The name of this file changed from 1.9 to 1.10.
 - name: Copy default .htaccess to the root directory of elgg tree
   copy: src="/opt/{{ elgg_xx }}/install/config/htaccess.dist"
diff --git a/roles/elgg/templates/settings.php.j2 b/roles/elgg/templates/settings.php.j2
index a9124440e..b063be31a 100644
--- a/roles/elgg/templates/settings.php.j2
+++ b/roles/elgg/templates/settings.php.j2
@@ -1,5 +1,5 @@
 <?php
-date_default_timezone_set({{ timezone }});
+date_default_timezone_set({{ local_tz }});
 /**
  * Defines database credentials.
  *
diff --git a/roles/httpd/templates/php.ini.j2 b/roles/httpd/templates/php.ini.j2
index 2c951d08a..04a5ec594 100755
--- a/roles/httpd/templates/php.ini.j2
+++ b/roles/httpd/templates/php.ini.j2
@@ -633,7 +633,7 @@ default_socket_timeout = 60
 
 [Date]
 ; Defines the default timezone used by the date functions
-;date.timezone =
+date.timezone = {{ local_tz }}
 
 ;date.default_latitude = 31.7667
 ;date.default_longitude = 35.2333
diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml
index 8b55efda7..9b9600a7e 100644
--- a/roles/mysql/tasks/main.yml
+++ b/roles/mysql/tasks/main.yml
@@ -90,9 +90,6 @@
       mysql_db: db=test state=absent
       when: mysql_enabled
 
-    - name: Set the php default date, so it does not complain
-      lineinfile: line="date.timezone = {{ local_tz }}" dest=/etc/php.ini
-
 # we had to start mysql in order to configure it, now turn if off if not enabled
     - name: Provisioally Disable the MySQL service
       service: name={{ mysql_service }}