diff --git a/plinth/modules/backups/templates/backups_add_remote_repository.html b/plinth/modules/backups/templates/backups_add_remote_repository.html
index 60bcb87f6..83a7d7770 100644
--- a/plinth/modules/backups/templates/backups_add_remote_repository.html
+++ b/plinth/modules/backups/templates/backups_add_remote_repository.html
@@ -8,7 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'backups/backups_add_remote_repository.js' %}"
+  <script src="{% static 'backups/backups_add_remote_repository.js' %}"
           defer></script>
 {% endblock %}
 
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns-domain.html b/plinth/modules/dynamicdns/templates/dynamicdns-domain.html
index 8943b5da9..cf687515e 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns-domain.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns-domain.html
@@ -6,6 +6,5 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'dynamicdns/dynamicdns.js' %}"
-          defer></script>
+  <script src="{% static 'dynamicdns/dynamicdns.js' %}" defer></script>
 {% endblock %}
diff --git a/plinth/modules/ejabberd/templates/ejabberd.html b/plinth/modules/ejabberd/templates/ejabberd.html
index 6e2c02f65..f7c2586c2 100644
--- a/plinth/modules/ejabberd/templates/ejabberd.html
+++ b/plinth/modules/ejabberd/templates/ejabberd.html
@@ -8,8 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'ejabberd/ejabberd.js' %}"
-          defer></script>
+  <script src="{% static 'ejabberd/ejabberd.js' %}" defer></script>
 {% endblock %}
 
 {% block status %}
diff --git a/plinth/modules/janus/templates/janus_video_room.html b/plinth/modules/janus/templates/janus_video_room.html
index 96fe32c90..bd6e5313f 100644
--- a/plinth/modules/janus/templates/janus_video_room.html
+++ b/plinth/modules/janus/templates/janus_video_room.html
@@ -29,26 +29,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Janus Video Room</title>
 
-    <script type="text/javascript"
-            src="/javascript/webrtc-adapter/adapter.min.js" ></script>
-    <script type="text/javascript"
-            src="/javascript/jquery/jquery.min.js" ></script>
-    <script type="text/javascript"
-            src="/javascript/popperjs2/popper.min.js"></script>
-    <script type="text/javascript"
-            src="/javascript/jquery-blockui/jquery.blockUI.min.js" ></script>
-    <script type="text/javascript"
-            src="/javascript/bootstrap5/js/bootstrap.min.js" ></script>
-    <script type="text/javascript"
-            src="/javascript/bootbox/bootbox.min.js" ></script>
-    <script type="text/javascript"
-            src="/javascript/toastr/toastr.min.js" ></script>
-    <script type="text/javascript"
-            src="{% static 'janus/janus-freedombox-config.js' %}" ></script>
-    <script type="text/javascript"
-            src="/javascript/janus-gateway/janus.min.js" ></script>
-    <script type="text/javascript"
-            src="{% static 'janus/janus-video-room.js' %}" ></script>
+    <script src="/javascript/webrtc-adapter/adapter.min.js" ></script>
+    <script src="/javascript/jquery/jquery.min.js" ></script>
+    <script src="/javascript/popperjs2/popper.min.js"></script>
+    <script src="/javascript/jquery-blockui/jquery.blockUI.min.js" ></script>
+    <script src="/javascript/bootstrap5/js/bootstrap.min.js" ></script>
+    <script src="/javascript/bootbox/bootbox.min.js" ></script>
+    <script src="/javascript/toastr/toastr.min.js" ></script>
+    <script src="{% static 'janus/janus-freedombox-config.js' %}" ></script>
+    <script src="/javascript/janus-gateway/janus.min.js" ></script>
+    <script src="{% static 'janus/janus-video-room.js' %}" ></script>
 
     <link rel="stylesheet"
           href="/javascript/bootstrap5/css/bootstrap.css"
diff --git a/plinth/modules/matrixsynapse/templates/matrix-synapse.html b/plinth/modules/matrixsynapse/templates/matrix-synapse.html
index 0fd4f054a..d0842ab79 100644
--- a/plinth/modules/matrixsynapse/templates/matrix-synapse.html
+++ b/plinth/modules/matrixsynapse/templates/matrix-synapse.html
@@ -7,8 +7,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'matrixsynapse/matrixsynapse.js' %}"
-          defer></script>
+  <script src="{% static 'matrixsynapse/matrixsynapse.js' %}" defer></script>
 {% endblock %}
 
 {% block status %}
diff --git a/plinth/modules/mediawiki/templates/mediawiki.html b/plinth/modules/mediawiki/templates/mediawiki.html
index 843c29470..bbf8cf109 100644
--- a/plinth/modules/mediawiki/templates/mediawiki.html
+++ b/plinth/modules/mediawiki/templates/mediawiki.html
@@ -7,6 +7,5 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'mediawiki/mediawiki.js' %}"
-          defer></script>
+  <script src="{% static 'mediawiki/mediawiki.js' %}" defer></script>
 {% endblock %}
diff --git a/plinth/modules/networks/templates/connections_edit.html b/plinth/modules/networks/templates/connections_edit.html
index 59bb64073..55c4e13ba 100644
--- a/plinth/modules/networks/templates/connections_edit.html
+++ b/plinth/modules/networks/templates/connections_edit.html
@@ -7,8 +7,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'networks/networks.js' %}"
-          defer></script>
+  <script src="{% static 'networks/networks.js' %}" defer></script>
 {% endblock %}
 
 {% block content %}
diff --git a/plinth/modules/sharing/templates/sharing_add_edit.html b/plinth/modules/sharing/templates/sharing_add_edit.html
index e38fffc39..469414ecc 100644
--- a/plinth/modules/sharing/templates/sharing_add_edit.html
+++ b/plinth/modules/sharing/templates/sharing_add_edit.html
@@ -8,8 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'sharing/sharing_add_edit.js' %}"
-          defer></script>
+  <script src="{% static 'sharing/sharing_add_edit.js' %}" defer></script>
 {% endblock %}
 
 {% block content %}
diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html
index 24be26f8a..643e2f0cf 100644
--- a/plinth/modules/snapshot/templates/snapshot_manage.html
+++ b/plinth/modules/snapshot/templates/snapshot_manage.html
@@ -8,8 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'snapshot/snapshot.js' %}"
-          defer></script>
+  <script src="{% static 'snapshot/snapshot.js' %}" defer></script>
 {% endblock %}
 
 {% block configuration %}
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index ece5c5f5f..67ce2c549 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -8,8 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'tor/tor.js' %}"
-          defer></script>
+  <script src="{% static 'tor/tor.js' %}" defer></script>
 {% endblock %}
 
 {% block status %}
diff --git a/plinth/modules/torproxy/templates/torproxy.html b/plinth/modules/torproxy/templates/torproxy.html
index 4466771ba..fdf3d9969 100644
--- a/plinth/modules/torproxy/templates/torproxy.html
+++ b/plinth/modules/torproxy/templates/torproxy.html
@@ -6,6 +6,5 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'torproxy/torproxy.js' %}"
-          defer></script>
+  <script src="{% static 'torproxy/torproxy.js' %}" defer></script>
 {% endblock %}
diff --git a/plinth/modules/users/templates/users_update.html b/plinth/modules/users/templates/users_update.html
index 2eb84bb85..8bbcdf6ed 100644
--- a/plinth/modules/users/templates/users_update.html
+++ b/plinth/modules/users/templates/users_update.html
@@ -8,8 +8,7 @@
 {% load static %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'users/users.js' %}"
-          defer></script>
+  <script src="{% static 'users/users.js' %}" defer></script>
 {% endblock %}
 
 {% block content %}
diff --git a/plinth/templates/apps.html b/plinth/templates/apps.html
index 439c36a17..5b5112706 100644
--- a/plinth/templates/apps.html
+++ b/plinth/templates/apps.html
@@ -7,7 +7,7 @@
 {% load i18n %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'tags.js' %}" defer></script>
+  <script src="{% static 'tags.js' %}" defer></script>
 {% endblock %}
 
 {% block body_class %}apps-page{% endblock %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index daa2556c5..245351aab 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -60,13 +60,13 @@
 
   <!-- This script is not loaded in defer mode because it needs to run before
        page is rendered -->
-  <script type="text/javascript" src="{% static 'theme/js/color-modes.js' %}"></script>
+  <script src="{% static 'theme/js/color-modes.js' %}"></script>
   <!-- Local link to system Bootstrap JS -->
-  <script type="text/javascript" src="{% static '/javascript/popperjs2/popper.min.js' %}" defer></script>
-  <script type="text/javascript" src="{% static '/javascript/bootstrap5/js/bootstrap.bundle.min.js' %}" defer></script>
-  <script type="text/javascript" src="{% static '/javascript/htmx/htmx.min.js' %}" defer></script>
+  <script src="{% static '/javascript/popperjs2/popper.min.js' %}" defer></script>
+  <script src="{% static '/javascript/bootstrap5/js/bootstrap.bundle.min.js' %}" defer></script>
+  <script src="{% static '/javascript/htmx/htmx.min.js' %}" defer></script>
 
-  <script type="text/javascript" src="{% static 'theme/js/main.js' %}" defer></script>
+  <script src="{% static 'theme/js/main.js' %}" defer></script>
   {% block app_js %}<!-- placeholder for app-specific js files -->{% endblock %}
   {% block page_js %}<!-- placeholder for page-specific js files -->{% endblock %}
 
diff --git a/plinth/templates/system.html b/plinth/templates/system.html
index 6f573d179..1cacd40ae 100644
--- a/plinth/templates/system.html
+++ b/plinth/templates/system.html
@@ -7,7 +7,7 @@
 {% load i18n %}
 
 {% block page_js %}
-  <script type="text/javascript" src="{% static 'tags.js' %}" defer></script>
+  <script src="{% static 'tags.js' %}" defer></script>
 {% endblock %}
 
 {% block body_class %}system-page{% endblock %}