diff --git a/app/history_meta.py b/app/history_meta.py
index 0ccc06f09..be0c184b5 100644
--- a/app/history_meta.py
+++ b/app/history_meta.py
@@ -208,6 +208,9 @@ def create_history(obj):
         obj.created_at = datetime.datetime.utcnow()
     else:
         obj.version += 1
+        now = datetime.datetime.utcnow()
+        obj.updated_at = now
+        data['updated_at'] = now
 
     data['version'] = obj.version
     data['created_at'] = obj.created_at
diff --git a/app/schemas.py b/app/schemas.py
index 6496797e7..64f4bbf98 100644
--- a/app/schemas.py
+++ b/app/schemas.py
@@ -108,7 +108,7 @@ class BaseTemplateSchema(BaseSchema):
 
     class Meta:
         model = models.Template
-        exclude = ("updated_at", "created_at", "service_id", "jobs")
+        exclude = ("service_id", "jobs")
 
 
 class TemplateSchema(BaseTemplateSchema):
diff --git a/tests/app/template/test_rest.py b/tests/app/template/test_rest.py
index 5495277af..b7ea2d47e 100644
--- a/tests/app/template/test_rest.py
+++ b/tests/app/template/test_rest.py
@@ -269,8 +269,10 @@ def test_should_be_able_to_get_all_templates_for_a_service(notify_api, sample_us
             update_json_resp = json.loads(response.get_data(as_text=True))
             assert update_json_resp['data'][0]['name'] == 'my template 1'
             assert update_json_resp['data'][0]['version'] == 1
+            assert update_json_resp['data'][0]['created_at']
             assert update_json_resp['data'][1]['name'] == 'my template 2'
             assert update_json_resp['data'][1]['version'] == 1
+            assert update_json_resp['data'][1]['created_at']
 
 
 def test_should_get_only_templates_for_that_service(notify_api, sample_user, service_factory):
diff --git a/tests/app/template/test_rest_history.py b/tests/app/template/test_rest_history.py
index ce3c2619d..5b0c919b6 100644
--- a/tests/app/template/test_rest_history.py
+++ b/tests/app/template/test_rest_history.py
@@ -91,5 +91,7 @@ def test_all_versions_of_template(notify_api, sample_template):
             json_resp = json.loads(resp.get_data(as_text=True))
             assert len(json_resp['data']) == 3
             assert json_resp['data'][0]['content'] == newest_content
+            assert json_resp['data'][0]['updated_at']
             assert json_resp['data'][1]['content'] == newer_content
+            assert json_resp['data'][1]['updated_at']
             assert json_resp['data'][2]['content'] == old_content