diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly
index f99923b6..36523e82 100644
--- a/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly
+++ b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly
@@ -9,7 +9,7 @@
       <h1>${%Agent Configuration History}</h1>
       <div>
 
-        <script src="${rootURL}/plugin/jobConfigHistory/deleteRevisionAndTableEntry.js"/>
+        <st:adjunct includes="hudson.plugins.jobConfigHistory.deleteRevisionAndTableEntry" />
         <j:set var="configs" value="${it.getAgentConfigs()}" />
         <j:choose>
           <j:when test="${configs.size() == 0}">
@@ -111,7 +111,7 @@
                         <j:if test="${it.hasDeleteEntryPermission()}">
                           <td style="text-align:center">
                               <j:set var="message" value="${%Do you really want to delete the history entry} "/>
-                              <button type="button" class="jch delete-button" onClick="removeEntryFromTable('table-row-${configNr}', '${config.date}', 'null', '${message}')" value="X">
+                              <button type="button" class="jch delete-button agent-config-history-delete-button" data-config-nr="${configNr}" data-config-date="${config.date}" data-message-text="${message}" value="X">
                                 <l:icon class="icon-stop icon-sm" alt="${%Delete Revision}"/>
                               </button>
                           </td>
diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly
index b77df9f6..f3929e5e 100644
--- a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly
+++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly
@@ -8,7 +8,7 @@
     <l:main-panel>
       <l:app-bar title="${%Job Configuration History}"/>
       <div>
-        <script src="${rootURL}/plugin/jobConfigHistory/deleteRevisionAndTableEntry.js" />
+        <st:adjunct includes="hudson.plugins.jobConfigHistory.deleteRevisionAndTableEntry" />
         <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />
         <j:set var="pageNum" value="${request.getParameter('pageNum')}" />
         <j:set var="entriesPerPage" value="${request.getParameter('entriesPerPage')}" />
@@ -131,7 +131,7 @@
                           <td style="text-align:center">
                             <j:if test="${it.hasDeleteEntryPermission()}">
                               <j:set var="message" value="${%Do you really want to delete the history entry} " />
-                              <button type="button" class="jenkins-button jenkins-button--destructive" onClick="removeEntryFromTable('table-row-${configNr}', '${config.date}', 'null', '${message}')" value="X">
+                              <button type="button" class="jenkins-button jenkins-button--destructive system-config-history-delete-button" data-config-nr="${configNr}" data-config-date="${config.date}" data-message-text="${message}" value="X">
                                 <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-md" alt="${%Delete Revision}" />
                               </button>
                             </j:if>
diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly
index 31356dca..83b2b819 100644
--- a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly
+++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly
@@ -57,7 +57,7 @@
         </j:otherwise>
       </j:choose>
 
-      <script src="${rootURL}/plugin/jobConfigHistory/deleteRevisionAndTableEntry.js" />
+      <st:adjunct includes="hudson.plugins.jobConfigHistory.deleteRevisionAndTableEntry" />
       <div>
         <j:choose>
           <j:when test="${!it.hasConfigurePermission() and !isDeleted}">
@@ -133,15 +133,7 @@
                         <j:if test="${it.hasDeleteEntryPermission() and !config.operation.toString().equals(&quot;Deleted&quot;)}">
                           <j:set var="message" value="${%Do you really want to delete the history entry} " />
                           <div id="target-div" jobName="${config.getJob()}">
-                            <script>
-                              var targetDiv = document.querySelector('#target-div');
-                              var JsJobName = targetDiv.getAttribute('jobName');
-
-                              function removeEntryFromTable2(JsConfigNr, JsConfigDate, JsMessage){
-                                removeEntryFromTable('table-row-' + JsConfigNr, JsConfigDate, JsJobName, JsMessage)
-                              }
-                            </script>
-                            <button type="button" class="jenkins-button jenkins-button--destructive" data-config-date="${config.date}" onClick="removeEntryFromTable2('${configNr}', this.getAttribute('data-config-date'), '${message}')" value="X">
+                            <button type="button" class="jenkins-button jenkins-button--destructive system-config-history-delete-button" data-config-nr="${configNr}" data-config-date="${config.date}" data-message-text="${message}" value="X">
                               <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-md" alt="${%Delete Revision}" />
                             </button>
                           </div>
diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/deleteRevisionAndTableEntry.js b/src/main/resources/hudson/plugins/jobConfigHistory/deleteRevisionAndTableEntry.js
new file mode 100644
index 00000000..3d84165d
--- /dev/null
+++ b/src/main/resources/hudson/plugins/jobConfigHistory/deleteRevisionAndTableEntry.js
@@ -0,0 +1,46 @@
+//name is an optional parameter for job deletion history and system config history
+function removeEntryFromTable(id, timestamp, name, message) {
+    var confirmPhrase = message + timestamp + '?';
+    if (confirm(confirmPhrase)) {
+        var tableRow = document.getElementById(id);
+        tableRow.parentNode.removeChild(tableRow);
+
+        //redirect
+        var xmlHttp = new XMLHttpRequest();
+        var url = 'deleteRevision?timestamp=' + timestamp;
+        if (name != null) {
+            url += "&name=" + name;
+        }
+        xmlHttp.open("POST", url, true);
+        xmlHttp.setRequestHeader(document.head.getAttribute('data-crumb-header'), document.head.getAttribute('data-crumb-value'));
+        xmlHttp.send(null);
+    }
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+    const targetDiv = document.querySelector('#target-div');
+    let jobName = null;
+    if (targetDiv) {
+        jobName = targetDiv.getAttribute('jobName');
+    }
+
+    const systemConfigDeleteButtons = document.querySelectorAll('.system-config-history-delete-button');
+    systemConfigDeleteButtons.forEach((button) => {
+        button.addEventListener('click', () => {
+            const configNr = button.getAttribute('data-config-nr');
+            const configDate = button.getAttribute('data-config-date');
+            const message = button.getAttribute('data-message-text');
+            removeEntryFromTable(`table-row-${configNr}`, configDate, jobName, message);
+        });
+    });
+
+    const agentConfigDeleteButtons = document.querySelectorAll('.agent-config-history-delete-button');
+    agentConfigDeleteButtons.forEach((button) => {
+        button.addEventListener('click', () => {
+            const configNr = button.getAttribute('data-config-nr');
+            const configDate = button.getAttribute('data-config-date');
+            const message = button.getAttribute('data-message-text');
+            removeEntryFromTable(`table-row-${configNr}`, configDate, null, message);
+        });
+    });
+});
diff --git a/src/main/webapp/deleteRevisionAndTableEntry.js b/src/main/webapp/deleteRevisionAndTableEntry.js
deleted file mode 100644
index d7f5aeb4..00000000
--- a/src/main/webapp/deleteRevisionAndTableEntry.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//name is an optional parameter for job deletion history and system config history
-function removeEntryFromTable(id, timestamp, name, message) {
-    var confirmPhrase = message + timestamp + '?';
-    if (confirm(confirmPhrase)) {
-        var tableRow = document.getElementById(id);
-        tableRow.parentNode.removeChild(tableRow);
-
-        //redirect
-        var xmlHttp = new XMLHttpRequest();
-        var url = 'deleteRevision?timestamp=' + timestamp;
-        if (name != null) {
-            url += "&name=" + name;
-        }
-        xmlHttp.open("POST", url, true);
-        xmlHttp.setRequestHeader(document.head.getAttribute('data-crumb-header'), document.head.getAttribute('data-crumb-value'));
-        xmlHttp.send(null);
-    } else {
-        return false;
-    }
-}