diff --git a/download/aws-images.md b/download/aws-images.md
index 074eb26..e724e23 100644
--- a/download/aws-images.md
+++ b/download/aws-images.md
@@ -1,5 +1,7 @@
 ---
 title: "CentOS AWS AMI Cloud Images"
+
+with_datatables: true
 ---
 
 CentOS Amazon AMI images
@@ -21,7 +23,7 @@ Worth knowing that starting from CentOS Stream 9 the cloud user is `ec2-user` wh
 </div>
 
 
-<table id="download-mirror" class="table table-borderless table-hover">
+<table id="DataTables_Table_0" class="table table-bordered table-hover dataTable">
 <thead class="thead-dark">
   <tr>
     <th class="col-0 text-nowrap">Version</th>
@@ -34,21 +36,21 @@ Worth knowing that starting from CentOS Stream 9 the cloud user is `ec2-user` wh
 <tbody>
 {% for row in site.data.aws-images %}
   <tr>
-    <td class="text-nowrap">{{ row["Version"] }}</td>
-    <td class="text-nowrap">{{ row["Region"] }}</td>
-    <td class="text-nowrap">{{ row["Architecture"] }}</td>
-    <td class="text-nowrap">{{ row["AMI ID"] }}</td>
-    <td class="text-nowrap"><a href="{{ row["Deploy link"] }}"><i class="fab fa-aws"></i> Deploy link</a></td>
+    <td class="text-nowrap align-middle">{{ row["Version"] }}</td>
+    <td class="text-nowrap align-middle">{{ row["Region"] }}</td>
+    <td class="text-nowrap align-middle">{{ row["Architecture"] }}</td>
+    <td class="text-nowrap align-middle">{{ row["AMI ID"] }}</td>
+    <td class="text-nowrap align-middle">
+        {% assign row_deploy_link = row["Deploy link"] %}
+        {% include base/link.html
+           name="Deploy link"
+           class="btn btn-sm btn-primary"
+           icon="fa-brands fa-aws"
+           icon_position="start"
+           url=row_deploy_link
+        %}</td>
+
   </tr>
 {% endfor %}
 </tbody>
-<tfoot>
-  <tr>
-    <th class="searchable"></th>
-    <th class="searchable"></th>
-    <th class="searchable"></th>
-    <th class="searchable"></th>
-    <th></th>
-  </tr>
-</tfoot>
 </table>