diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6d1d901
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM checkmarx/kics:v1.4.5-alpine
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dist/index.js b/dist/index.js
index e882335..4dc25be 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -17819,9 +17819,11 @@ const severityIcons = {
 function createComment(results) {
     let message = "![kics-logo](" + kicsLogo + ")\n";
 
-    message += "---";
+    message += "<table>";
+    message += "<tr></tr>";
+    message += "<tr><td>";
+
     message += `\n**KICS version: ${results['kics_version']}**\n`
-    message += "\n**Total Results: " + results['total_counter'] + "**\n\n";
     message += "| | Category | Results |\n";
     message += "| --- |--- | --- |\n";
     let severityCounters = results['severity_counters']
@@ -17830,8 +17832,9 @@ function createComment(results) {
             message += "| ![" + severity + "](" + severityIcons[severity] + ") |" + severity.toUpperCase() + " | " + severityCounters[severity.toUpperCase()] + " |\n";
         }
     }
+    message += `| ![TOTAL](https://user-images.githubusercontent.com/23239410/92157090-97c0ec80-ee32-11ea-9b2e-aa6b32b03d54.png) | TOTAL | ${results['total_counter']} |`;
+    message += "</td><td>";
 
-    message += "\n**Scan Metrics**\n\n";
     message += "| Metric | Values |\n";
     message += "| --- | --- |\n";
     message += "| Files scanned | " + results['files_scanned'] + "\n";
@@ -17839,10 +17842,8 @@ function createComment(results) {
     message += "| Files failed to scan | " + results['files_failed_to_scan'] + "\n";
     message += "| Total queries | " + results['queries_total'] + "\n";
     message += "| Queries failed to execute | " + results['queries_failed_to_execute'] + "\n";
-
-    let executionTime = moment(results['end']).diff(moment(results['start']), 'seconds');
-
-    message += "| Execution time | " + executionTime + "s\n";
+    message += "| Execution time | " + moment(results['end']).diff(moment(results['start']), 'seconds') + "s\n";
+    message += "</td></tr></table>";
 
     return message;
 }
@@ -18315,11 +18316,6 @@ const io = __nccwpck_require__(7436);
 
 const fs = __nccwpck_require__(5747);
 
-const actionInputs = {
-    kics_version: { value: core.getInput('kics_version') },
-    enable_comments: { value: core.getInput('enable_comments') },
-}
-
 const exitStatus = {
     results: {
         codes: {
@@ -18387,7 +18383,7 @@ async function main() {
     try {
         const githubToken = core.getInput("token");
         const octokit = github.getOctokit(githubToken);
-        let enableComments = actionInputs.enable_comments.value.toLocaleLowerCase() === "true";
+        let enableComments = core.getInput('enable_comments').toLocaleLowerCase() === "true";
         let context = {};
         let repo = '';
         let prNumber = '';