diff --git a/recmaint/urls.py b/recmaint/urls.py
index c8ec445..1bb2eec 100644
--- a/recmaint/urls.py
+++ b/recmaint/urls.py
@@ -26,9 +26,9 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path('auth/', include([
         path('login/', LoginView.as_view(
-            template_name="auth/login.djhtml",
+            template_name="auth/login.dj.html",
             redirect_authenticated_user=True), name='login'),
-        path('logout/', LogoutView.as_view(template_name="auth/logout.djhtml"), name='logout'),
+        path('logout/', LogoutView.as_view(template_name="auth/logout.dj.html"), name='logout'),
     ])),
     path('markdownx/', include('markdownx.urls')),
 ]
diff --git a/tasks/templates/tasks/components/task_li.djhtml b/tasks/templates/tasks/components/task_li.dj.html
similarity index 100%
rename from tasks/templates/tasks/components/task_li.djhtml
rename to tasks/templates/tasks/components/task_li.dj.html
diff --git a/tasks/templates/tasks/components/tool_li.djhtml b/tasks/templates/tasks/components/tool_li.dj.html
similarity index 100%
rename from tasks/templates/tasks/components/tool_li.djhtml
rename to tasks/templates/tasks/components/tool_li.dj.html
diff --git a/tasks/templates/tasks/index.djhtml b/tasks/templates/tasks/index.dj.html
similarity index 65%
rename from tasks/templates/tasks/index.djhtml
rename to tasks/templates/tasks/index.dj.html
index fa9c4e6..64ad3da 100644
--- a/tasks/templates/tasks/index.djhtml
+++ b/tasks/templates/tasks/index.dj.html
@@ -1,10 +1,10 @@
-{% extends "base.djhtml" %}
+{% extends "base.dj.html" %}
 
 {% block content %}
   <h1> Tools </h1>
   <ul>
     {% for tool in tools %}
-      {% include "./components/tool_li.djhtml" with tool=tool %}
+      {% include "./components/tool_li.dj.html" with tool=tool %}
     {% empty %}
       <p>No tools are available.</p>
     {% endfor %}
@@ -13,7 +13,7 @@
   <h1> Tasks </h1>
   <ul>
     {% for task in tasks %}
-      {% include "./components/task_li.djhtml" with task=task %}
+      {% include "./components/task_li.dj.html" with task=task %}
     {% empty %}
       <p>No tasks are available.</p>
     {% endfor %}
diff --git a/tasks/templates/tasks/taskDetail.djhtml b/tasks/templates/tasks/taskDetail.dj.html
similarity index 99%
rename from tasks/templates/tasks/taskDetail.djhtml
rename to tasks/templates/tasks/taskDetail.dj.html
index 46e5022..ec927b7 100644
--- a/tasks/templates/tasks/taskDetail.djhtml
+++ b/tasks/templates/tasks/taskDetail.dj.html
@@ -1,4 +1,4 @@
-{% extends "base.djhtml" %}
+{% extends "base.dj.html" %}
 
 {% load markdownify %}
 {% load widget_tweaks %}
diff --git a/tasks/templates/tasks/toolDetail.djhtml b/tasks/templates/tasks/toolDetail.dj.html
similarity index 92%
rename from tasks/templates/tasks/toolDetail.djhtml
rename to tasks/templates/tasks/toolDetail.dj.html
index 106bbfd..19c0d17 100644
--- a/tasks/templates/tasks/toolDetail.djhtml
+++ b/tasks/templates/tasks/toolDetail.dj.html
@@ -1,4 +1,4 @@
-{% extends "base.djhtml" %}
+{% extends "base.dj.html" %}
 
 {% load markdownify %}
 
@@ -18,7 +18,7 @@
     <h2>Tasks</h2>
     <ul>
       {% for task in tasks %}
-        {% include "./components/task_li.djhtml" with task=task %}
+        {% include "./components/task_li.dj.html" with task=task %}
       {% endfor %}
     </ul>
   </section>
diff --git a/tasks/views.py b/tasks/views.py
index ed21ea1..5154db1 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -10,7 +10,7 @@ def index(request):
         'tools': Tool.objects.all(),
         'tasks': Task.objects.all(),
     }
-    return render(request, 'tasks/index.djhtml', context)
+    return render(request, 'tasks/index.dj.html', context)
 
 
 def toolDetail(request, tool_slug):
@@ -22,7 +22,7 @@ def toolDetail(request, tool_slug):
         'tasks': tasks,
         'events': events,
     }
-    return render(request, 'tasks/toolDetail.djhtml', context)
+    return render(request, 'tasks/toolDetail.dj.html', context)
 
 
 def taskDetail(request, tool_slug, task_slug):
@@ -55,4 +55,4 @@ def taskDetail(request, tool_slug, task_slug):
             'task_subs': task.grouptasksubscription_set.filter(group__user=request.user),
             'tool_subs': tool.grouptoolsubscription_set.filter(group__user=request.user),
         })
-    return render(request, 'tasks/taskDetail.djhtml', context)
+    return render(request, 'tasks/taskDetail.dj.html', context)
diff --git a/templates/auth/login.djhtml b/templates/auth/login.dj.html
similarity index 97%
rename from templates/auth/login.djhtml
rename to templates/auth/login.dj.html
index e24d5e6..7552f08 100644
--- a/templates/auth/login.djhtml
+++ b/templates/auth/login.dj.html
@@ -1,4 +1,4 @@
-{% extends "base.djhtml" %}
+{% extends "base.dj.html" %}
 
 {% load widget_tweaks %}
 
diff --git a/templates/auth/logout.djhtml b/templates/auth/logout.dj.html
similarity index 88%
rename from templates/auth/logout.djhtml
rename to templates/auth/logout.dj.html
index 0d8e7f4..704a0f2 100644
--- a/templates/auth/logout.djhtml
+++ b/templates/auth/logout.dj.html
@@ -1,4 +1,4 @@
-{% extends "base.djhtml" %}
+{% extends "base.dj.html" %}
 
 {% block title %} Logout {% endblock %}
 
diff --git a/templates/base.djhtml b/templates/base.dj.html
similarity index 100%
rename from templates/base.djhtml
rename to templates/base.dj.html