diff --git a/agent/kraken/agent/agent.py b/agent/kraken/agent/agent.py
index 556ae743..88786bd0 100755
--- a/agent/kraken/agent/agent.py
+++ b/agent/kraken/agent/agent.py
@@ -172,7 +172,7 @@ def main():
     if not srv.srv_addr:
         print('There is missing server address.')
         print('Run agent with -s parameter or start agent container')
-        print('with KRAKEN_SERVER_ADDR env variable set properly')
+        print('with KRAKEN_SERVER_ADDR env variable set properly.')
         sys.exit(1)
 
     host_info = collect_host_info()
diff --git a/ui/package-lock.json b/ui/package-lock.json
index a20a94dc..702d3803 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -8149,6 +8149,11 @@
                 "yallist": "^4.0.0"
             }
         },
+        "luxon": {
+            "version": "1.26.0",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.26.0.tgz",
+            "integrity": "sha512-+V5QIQ5f6CDXQpWNICELwjwuHdqeJM1UenlZWx5ujcRMc9venvluCjFb4t5NYLhb6IhkbMVOxzVuOqkgMxee2A=="
+        },
         "magic-string": {
             "version": "0.25.7",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -8586,14 +8591,6 @@
             "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
             "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
         },
-        "moment-timezone": {
-            "version": "0.5.33",
-            "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
-            "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
-            "requires": {
-                "moment": ">= 2.9.0"
-            }
-        },
         "move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/ui/package.json b/ui/package.json
index 6f16ae49..fc9e340d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -25,8 +25,7 @@
     "chartjs-plugin-error-bars": "^1.2.3",
     "codemirror": "^5.60.0",
     "font-awesome": "^4.7.0",
-    "moment": "^2.29.1",
-    "moment-timezone": "^0.5.33",
+    "luxon": "^1.26.0",
     "primeflex": "^2.0.0",
     "primeicons": "^4.1.0",
     "primeng": "^11.0.0",
diff --git a/ui/src/app/project-settings/project-settings.component.html b/ui/src/app/project-settings/project-settings.component.html
index 646175ca..5c8c27b1 100644
--- a/ui/src/app/project-settings/project-settings.component.html
+++ b/ui/src/app/project-settings/project-settings.component.html
@@ -40,7 +40,7 @@ <h2 style="padding-left: 7px;">{{ project.name }}</h2>
               <table *ngIf="flows.flows.length > 0" >
                 <tr *ngFor="let flow of flows.flows" style="padding: 3px 6px;">
                   <td style="vertical-align: top; width: 3em;"><b><a routerLink="/flows/{{ flow.id }}">{{ flow.id }}</a>.</b></td>
-                  <td style="vertical-align: top;"><a routerLink="/flows/{{ flow.id }}" style="color: black;">{{ flow.created | localtime:'YYYY-MM-DD HH:mm' }}</a></td>
+                  <td style="vertical-align: top;"><a routerLink="/flows/{{ flow.id }}" style="color: black;">{{ flow.created | localtime:'yyyy-LL-dd HH:mm' }}</a></td>
                   <td style="vertical-align: top;">
                     <span *ngIf="flow.tests_total > 0"
                           [ngStyle]="{'border-radius': '4px', 'background-color': flow.tests_color, 'padding': '1px 3px', 'margin-right': '2px'}">{{ flow.tests_pass_ratio }}%&nbsp;pass</span>
diff --git a/ui/src/app/utils.ts b/ui/src/app/utils.ts
index 6f1c38a4..f0bc7093 100644
--- a/ui/src/app/utils.ts
+++ b/ui/src/app/utils.ts
@@ -1,25 +1,24 @@
-// import moment from 'moment';
-import moment from 'moment-timezone'
+import { DateTime } from "luxon";
 
 export function datetimeToLocal(d, fmt) {
     try {
         let tz = Intl.DateTimeFormat().resolvedOptions().timeZone
         if (!tz) {
-            tz = moment.tz.guess()
+            tz = DateTime.local().zoneName
         }
         if (tz) {
-            d = moment(d).tz(tz)
+            d = DateTime.fromISO(d).setZone(tz)
             tz = ''
         } else {
-            d = moment(d)
+            d = DateTime.fromISO(d)
             tz = ' UTC'
         }
 
         if (!fmt) {
-            fmt = 'YYYY-MM-DD HH:mm:ss'
+            fmt = 'yyyy-LL-dd HH:mm:ss'
         }
 
-        return d.format(fmt) + tz
+        return d.toFormat(fmt) + tz
     } catch (e) {
         return d
     }