diff --git a/combo_plugin_gnm/templatetags/gnm.py b/combo_plugin_gnm/templatetags/gnm.py
index b2df54f..43f819c 100644
--- a/combo_plugin_gnm/templatetags/gnm.py
+++ b/combo_plugin_gnm/templatetags/gnm.py
@@ -36,7 +36,7 @@ from django.utils.dateparse import parse_datetime
 from django.utils.http import quote
 from django.utils.html import format_html
 from django.utils.text import slugify
-from django.utils.timezone import is_naive, make_aware
+from django.utils.timezone import now, is_naive, make_aware
 from django.utils.safestring import mark_safe
 
 from combo.apps.dashboard.models import DashboardCell, Tile
@@ -242,7 +242,7 @@ def get_mairie_opening_hours(mairie_data):
     if 'properties' in mairie_data:
         mairie_data = mairie_data['properties']
 
-    base_datetime = make_aware(datetime.datetime.now())
+    base_datetime = now()
     days_list = []
     opening_hours_dict = OrderedDict(zip(EN_ABBREV_WEEKDAYS_LIST, [{
         'am': None, 'pm': None
@@ -298,7 +298,7 @@ def as_opening_hours_badge(data):
     if not data:
         return ''
 
-    base_datetime = make_aware(datetime.datetime.now())
+    base_datetime = now()
     exclusion_slots = []
     today = base_datetime.date()
     (slots, known_format) = get_slots_from_mdr_format(data, base_datetime)