diff --git a/package.json b/package.json
index f4b23c39d..740c5ef91 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "bootstrap": "5.3.3",
     "components-font-awesome": "5.9.0",
     "d3": "^7.9.0",
-    "datatables": "^1.10.18",
+    "datatables.net-bs5": "^2.1.8",
     "devbridge-autocomplete": "^1.4.11",
     "jquery": "^3.7.1",
     "masonry-layout": "^4.2.2",
diff --git a/wger/gym/templates/gym/partial_user_list.html b/wger/gym/templates/gym/partial_user_list.html
index 9c848d551..726c3d30e 100644
--- a/wger/gym/templates/gym/partial_user_list.html
+++ b/wger/gym/templates/gym/partial_user_list.html
@@ -1,10 +1,11 @@
 {% load i18n static %}
 
-<link rel="stylesheet" type="text/css" href="{% static 'yarn/datatables/media/css/dataTables.bootstrap4.min.css' %}">
-<script src="{% static 'yarn/datatables/media/js/jquery.datatables.min.js' %}" ></script>
-<script src="{% static 'yarn/datatables/media/js/dataTables.bootstrap4.min.js' %}" ></script>
+<link rel="stylesheet" type="text/css" href="{% static 'yarn/datatables.net-bs5/css/dataTables.bootstrap5.css' %}">
+<script src="{% static 'yarn/datatables.net/js/dataTables.js' %}" ></script>
+<script src="{% static 'yarn/datatables.net-bs5/js/dataTables.bootstrap5.js' %}" ></script>
 <script>
 $(document).ready( function () {
+    
     /* Make table sortable */
     $('#main_member_list').DataTable({
         paging: false,
@@ -14,6 +15,7 @@ $(document).ready( function () {
 });
 </script>
 
+<h1>addasd </h1>
 <table class="table table-hover table-responsive" id="main_member_list">
 <thead>
 <tr>
diff --git a/yarn.lock b/yarn.lock
index 9a04a2bc0..33c55b00b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,10 +270,18 @@ d3@^7.9.0:
     d3-transition "3"
     d3-zoom "3"
 
-datatables@^1.10.18:
-  version "1.10.18"
-  resolved "https://registry.yarnpkg.com/datatables/-/datatables-1.10.18.tgz#fee16e82aa70b17c5faf1a6954ac68f404f33a70"
-  integrity sha512-ntatMgS9NN6UMpwbmO+QkYJuKlVeMA2Mi0Gu/QxyIh+dW7ZjLSDhPT2tWlzjpIWEkDYgieDzS9Nu7bdQCW0sbQ==
+datatables.net-bs5@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-2.1.8.tgz#860717c4ee85ecb84812ba9a73fb1204aa2a68b6"
+  integrity sha512-YlGws8eI3iw/1AmKJH18+YMzm/UgGb6o9s14KAC24QT1/8anolm8GnVAgGcwUcvHm3hn1i8A5QXqgbqeMRINeg==
+  dependencies:
+    datatables.net "2.1.8"
+    jquery ">=1.7"
+
+datatables.net@2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.1.8.tgz#9b020f18e927cc924d72411f62dc595cc688669b"
+  integrity sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==
   dependencies:
     jquery ">=1.7"