diff --git a/src/main/java/org/example/team6backend/activity/dto/ActivityLogResponse.java b/src/main/java/org/example/team6backend/activity/dto/ActivityLogResponse.java
index cb97274..04c1d62 100644
--- a/src/main/java/org/example/team6backend/activity/dto/ActivityLogResponse.java
+++ b/src/main/java/org/example/team6backend/activity/dto/ActivityLogResponse.java
@@ -1,13 +1,14 @@
 package org.example.team6backend.activity.dto;
 
 import org.example.team6backend.activity.entity.ActivityLog;
-import java.time.LocalDateTime;
+
+import java.time.Instant;
 
 public class ActivityLogResponse {
 
 	private String action;
 	private String description;
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 	private String userName;
 
 	public static ActivityLogResponse fromEntity(ActivityLog activityLog) {
@@ -35,11 +36,11 @@ public void setDescription(String description) {
 		this.description = description;
 	}
 
-	public LocalDateTime getCreatedAt() {
+	public Instant getCreatedAt() {
 		return createdAt;
 	}
 
-	public void setCreatedAt(LocalDateTime createdAt) {
+	public void setCreatedAt(Instant createdAt) {
 		this.createdAt = createdAt;
 	}
 
diff --git a/src/main/java/org/example/team6backend/activity/entity/ActivityLog.java b/src/main/java/org/example/team6backend/activity/entity/ActivityLog.java
index 54f4065..81de6d6 100644
--- a/src/main/java/org/example/team6backend/activity/entity/ActivityLog.java
+++ b/src/main/java/org/example/team6backend/activity/entity/ActivityLog.java
@@ -4,7 +4,7 @@
 import org.example.team6backend.incident.entity.Incident;
 import org.example.team6backend.user.entity.AppUser;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @Entity
 @Table(name = "activity_log")
@@ -16,7 +16,7 @@ public class ActivityLog {
 
 	private String action;
 	private String description;
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 
 	@ManyToOne
 	@JoinColumn(name = "incident_id", nullable = false)
@@ -28,7 +28,7 @@ public class ActivityLog {
 
 	@PrePersist
 	void onCreated() {
-		createdAt = LocalDateTime.now();
+		createdAt = Instant.now();
 	}
 
 	public Long getId() {
@@ -55,11 +55,11 @@ public void setDescription(String description) {
 		this.description = description;
 	}
 
-	public LocalDateTime getCreatedAt() {
+	public Instant getCreatedAt() {
 		return createdAt;
 	}
 
-	public void setCreatedAt(LocalDateTime createdAt) {
+	public void setCreatedAt(Instant createdAt) {
 		this.createdAt = createdAt;
 	}
 
diff --git a/src/main/java/org/example/team6backend/comment/controller/CommentController.java b/src/main/java/org/example/team6backend/comment/controller/CommentController.java
index 35e1138..ecfffac 100644
--- a/src/main/java/org/example/team6backend/comment/controller/CommentController.java
+++ b/src/main/java/org/example/team6backend/comment/controller/CommentController.java
@@ -2,7 +2,7 @@
 
 import jakarta.validation.Valid;
 import org.example.team6backend.comment.dto.CommentRequest;
-import org.example.team6backend.comment.entity.Comment;
+import org.example.team6backend.comment.dto.CommentResponse;
 import org.example.team6backend.comment.service.CommentService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -22,8 +22,10 @@ public CommentController(CommentService commentService) {
 
 	@GetMapping("/incident/{incidentId}")
 	@ResponseBody
-	public ResponseEntity<List<Comment>> getCommentByIncidentId(@PathVariable Long incidentId) {
-		List<Comment> comments = commentService.getCommentByIncidentId(incidentId);
+	public ResponseEntity<List<CommentResponse>> getCommentByIncidentId(@PathVariable Long incidentId) {
+		List<CommentResponse> comments = commentService.getCommentByIncidentId(incidentId).stream()
+				.map(CommentResponse::fromEntity).toList();
+
 		return ResponseEntity.ok(comments);
 	}
 
diff --git a/src/main/java/org/example/team6backend/comment/dto/CommentResponse.java b/src/main/java/org/example/team6backend/comment/dto/CommentResponse.java
new file mode 100644
index 0000000..bd3a1c1
--- /dev/null
+++ b/src/main/java/org/example/team6backend/comment/dto/CommentResponse.java
@@ -0,0 +1,20 @@
+package org.example.team6backend.comment.dto;
+
+import org.example.team6backend.comment.entity.Comment;
+
+import java.time.Instant;
+
+public record CommentResponse(String id, String message, Instant createdAt, CommentUserResponse user
+
+) {
+	public static CommentResponse fromEntity(Comment comment) {
+		return new CommentResponse(comment.getId(), comment.getMessage(), comment.getCreatedAt(),
+				comment.getUser() != null
+						? new CommentUserResponse(comment.getUser().getId(), comment.getUser().getName(),
+								comment.getUser().getEmail())
+						: null);
+	}
+
+	public record CommentUserResponse(String id, String name, String email) {
+	}
+}
diff --git a/src/main/java/org/example/team6backend/comment/entity/Comment.java b/src/main/java/org/example/team6backend/comment/entity/Comment.java
index cec2b22..90409db 100644
--- a/src/main/java/org/example/team6backend/comment/entity/Comment.java
+++ b/src/main/java/org/example/team6backend/comment/entity/Comment.java
@@ -6,7 +6,7 @@
 import org.example.team6backend.incident.entity.Incident;
 import org.example.team6backend.user.entity.AppUser;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @Entity
 @Table(name = "comment")
@@ -30,11 +30,11 @@ public class Comment {
 	private AppUser user;
 
 	@Column(name = "created_at", nullable = false)
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 
 	@PrePersist
 	protected void onCreated() {
-		createdAt = LocalDateTime.now();
+		createdAt = Instant.now();
 	}
 
 }
diff --git a/src/main/java/org/example/team6backend/exception/ErrorResponse.java b/src/main/java/org/example/team6backend/exception/ErrorResponse.java
index 8055428..89cbb71 100644
--- a/src/main/java/org/example/team6backend/exception/ErrorResponse.java
+++ b/src/main/java/org/example/team6backend/exception/ErrorResponse.java
@@ -1,13 +1,13 @@
 package org.example.team6backend.exception;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 public class ErrorResponse {
 
 	private int status;
 	private String message;
-	private LocalDateTime timestamp;
+	private Instant timestamp;
 
-	public ErrorResponse(int status, String message, LocalDateTime timestamp) {
+	public ErrorResponse(int status, String message, Instant timestamp) {
 		this.status = status;
 		this.message = message;
 		this.timestamp = timestamp;
@@ -19,7 +19,7 @@ public int getStatus() {
 	public String getMessage() {
 		return message;
 	}
-	public LocalDateTime getTimestamp() {
+	public Instant getTimestamp() {
 		return timestamp;
 	}
 }
diff --git a/src/main/java/org/example/team6backend/exception/GlobalExceptionHandler.java b/src/main/java/org/example/team6backend/exception/GlobalExceptionHandler.java
index 62fca04..5c77f15 100644
--- a/src/main/java/org/example/team6backend/exception/GlobalExceptionHandler.java
+++ b/src/main/java/org/example/team6backend/exception/GlobalExceptionHandler.java
@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @RestControllerAdvice
 public class GlobalExceptionHandler {
@@ -14,25 +14,25 @@ public class GlobalExceptionHandler {
 	@ExceptionHandler(AccessDeniedException.class)
 	public ResponseEntity<ErrorResponse> handleAccessDeniedException(AccessDeniedException ex) {
 		ErrorResponse error = new ErrorResponse(HttpStatus.FORBIDDEN.value(),
-				"You do not have permission to access this resource!", LocalDateTime.now());
+				"You do not have permission to access this resource!", Instant.now());
 		return new ResponseEntity<>(error, HttpStatus.FORBIDDEN);
 	}
 
 	@ExceptionHandler(ResourceNotFoundException.class)
 	public ResponseEntity<ErrorResponse> handleNotFound(ResourceNotFoundException ex) {
-		ErrorResponse error = new ErrorResponse(HttpStatus.NOT_FOUND.value(), ex.getMessage(), LocalDateTime.now());
+		ErrorResponse error = new ErrorResponse(HttpStatus.NOT_FOUND.value(), ex.getMessage(), Instant.now());
 		return new ResponseEntity<>(error, HttpStatus.NOT_FOUND);
 	}
 
 	@ExceptionHandler(IllegalArgumentException.class)
 	public ResponseEntity<ErrorResponse> handleIllegalArgument(IllegalArgumentException ex) {
-		ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage(), LocalDateTime.now());
+		ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage(), Instant.now());
 		return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST);
 	}
 
 	@ExceptionHandler(IllegalStateException.class)
 	public ResponseEntity<ErrorResponse> handleIllegalState(IllegalStateException ex) {
-		ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage(), LocalDateTime.now());
+		ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage(), Instant.now());
 		return new ResponseEntity<>(error, HttpStatus.BAD_REQUEST);
 	}
 
@@ -40,7 +40,7 @@ public ResponseEntity<ErrorResponse> handleIllegalState(IllegalStateException ex
 	public ResponseEntity<ErrorResponse> handleGeneral(Exception ex) {
 		ex.printStackTrace();
 		ErrorResponse error = new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Something went wrong!",
-				LocalDateTime.now());
+				Instant.now());
 		return new ResponseEntity<>(error, HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 }
diff --git a/src/main/java/org/example/team6backend/incident/dto/IncidentResponse.java b/src/main/java/org/example/team6backend/incident/dto/IncidentResponse.java
index 4590f8a..2c1b2af 100644
--- a/src/main/java/org/example/team6backend/incident/dto/IncidentResponse.java
+++ b/src/main/java/org/example/team6backend/incident/dto/IncidentResponse.java
@@ -7,7 +7,7 @@
 import org.example.team6backend.incident.entity.IncidentStatus;
 import org.hibernate.Hibernate;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +21,7 @@ public class IncidentResponse {
 	private IncidentCategory incidentCategory;
 	private String createdBy;
 	private String assignedTo;
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 	private boolean hasDocuments;
 	private List<DocumentDTO> documents;
 
diff --git a/src/main/java/org/example/team6backend/incident/entity/Incident.java b/src/main/java/org/example/team6backend/incident/entity/Incident.java
index ec53efd..21576b8 100644
--- a/src/main/java/org/example/team6backend/incident/entity/Incident.java
+++ b/src/main/java/org/example/team6backend/incident/entity/Incident.java
@@ -3,7 +3,8 @@
 import jakarta.persistence.*;
 import org.example.team6backend.document.entity.Document;
 import org.example.team6backend.user.entity.AppUser;
-import java.time.LocalDateTime;
+
+import java.time.Instant;
 import java.util.List;
 
 @Entity
@@ -36,23 +37,23 @@ public class Incident {
 	private AppUser assignedTo;
 
 	@Column(name = "created_at")
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 
 	@Column(name = "updated_at")
-	private LocalDateTime updatedAt;
+	private Instant updatedAt;
 
 	@OneToMany(mappedBy = "incident", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Document> documents;
 
 	@PrePersist
 	protected void onCreate() {
-		createdAt = LocalDateTime.now();
-		updatedAt = LocalDateTime.now();
+		createdAt = Instant.now();
+		updatedAt = Instant.now();
 	}
 
 	@PreUpdate
 	protected void onUpdate() {
-		updatedAt = LocalDateTime.now();
+		updatedAt = Instant.now();
 	}
 
 	public Long getId() {
@@ -87,11 +88,11 @@ public AppUser getAssignedTo() {
 		return assignedTo;
 	}
 
-	public LocalDateTime getCreatedAt() {
+	public Instant getCreatedAt() {
 		return createdAt;
 	}
 
-	public LocalDateTime getUpdatedAt() {
+	public Instant getUpdatedAt() {
 		return updatedAt;
 	}
 
@@ -131,11 +132,11 @@ public void setAssignedTo(AppUser assignedTo) {
 		this.assignedTo = assignedTo;
 	}
 
-	public void setCreatedAt(LocalDateTime createdAt) {
+	public void setCreatedAt(Instant createdAt) {
 		this.createdAt = createdAt;
 	}
 
-	public void setUpdatedAt(LocalDateTime updatedAt) {
+	public void setUpdatedAt(Instant updatedAt) {
 		this.updatedAt = updatedAt;
 	}
 
diff --git a/src/main/java/org/example/team6backend/incident/service/IncidentService.java b/src/main/java/org/example/team6backend/incident/service/IncidentService.java
index d294d20..88c56e5 100644
--- a/src/main/java/org/example/team6backend/incident/service/IncidentService.java
+++ b/src/main/java/org/example/team6backend/incident/service/IncidentService.java
@@ -23,7 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
-import java.time.LocalDateTime;
+
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -74,8 +75,8 @@ public Incident createIncident(IncidentRequest incidentRequest, List<MultipartFi
 			incident.setIncidentCategory(incidentRequest.getIncidentCategory());
 			incident.setCreatedBy(user);
 			incident.setIncidentStatus(IncidentStatus.OPEN);
-			incident.setCreatedAt(LocalDateTime.now());
-			incident.setUpdatedAt(LocalDateTime.now());
+			incident.setCreatedAt(Instant.now());
+			incident.setUpdatedAt(Instant.now());
 
 			Incident savedIncident = incidentRepository.save(incident);
 
@@ -172,7 +173,7 @@ public Incident assignIncidentToHandler(Long incidentId, String handlerId, AppUs
 
 		AppUser oldHandler = incident.getAssignedTo();
 		incident.setAssignedTo(handler);
-		incident.setUpdatedAt(LocalDateTime.now());
+		incident.setUpdatedAt(Instant.now());
 
 		if (incident.getIncidentStatus() == IncidentStatus.OPEN) {
 			incident.setIncidentStatus(IncidentStatus.IN_PROGRESS);
@@ -208,7 +209,7 @@ public Incident updateIncidentStatus(Long incidentId, IncidentStatus newStatus,
 		}
 
 		incident.setIncidentStatus(newStatus);
-		incident.setUpdatedAt(LocalDateTime.now());
+		incident.setUpdatedAt(Instant.now());
 
 		Incident savedIncident = incidentRepository.save(incident);
 
@@ -245,7 +246,7 @@ public Incident unassignIncident(Long incidentId, AppUser currentUser) {
 		}
 
 		incident.setAssignedTo(null);
-		incident.setUpdatedAt(LocalDateTime.now());
+		incident.setUpdatedAt(Instant.now());
 
 		if (incident.getIncidentStatus() == IncidentStatus.IN_PROGRESS) {
 			incident.setIncidentStatus(IncidentStatus.OPEN);
@@ -285,7 +286,7 @@ public Incident closeIncident(Long incidentId, AppUser currentUser) {
 		IncidentStatus oldStatus = incident.getIncidentStatus();
 
 		incident.setIncidentStatus(IncidentStatus.CLOSED);
-		incident.setUpdatedAt(LocalDateTime.now());
+		incident.setUpdatedAt(Instant.now());
 
 		Incident savedIncident = incidentRepository.save(incident);
 
@@ -325,7 +326,7 @@ public Incident resolveIncident(Long incidentId, AppUser currentUser) {
 
 		IncidentStatus oldStatus = incident.getIncidentStatus();
 		incident.setIncidentStatus(IncidentStatus.RESOLVED);
-		incident.setUpdatedAt(LocalDateTime.now());
+		incident.setUpdatedAt(Instant.now());
 
 		Incident savedIncident = incidentRepository.save(incident);
 
diff --git a/src/main/java/org/example/team6backend/notification/dto/NotificationResponse.java b/src/main/java/org/example/team6backend/notification/dto/NotificationResponse.java
index 39b4eee..59963ae 100644
--- a/src/main/java/org/example/team6backend/notification/dto/NotificationResponse.java
+++ b/src/main/java/org/example/team6backend/notification/dto/NotificationResponse.java
@@ -2,14 +2,14 @@
 
 import org.example.team6backend.notification.entity.Notification;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 public class NotificationResponse {
 
 	private Long id;
 	private String message;
 	private Boolean read;
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 	private Long incidentId;
 
 	public static NotificationResponse fromEntity(Notification notification) {
@@ -46,11 +46,11 @@ public void setRead(Boolean read) {
 		this.read = read;
 	}
 
-	public LocalDateTime getCreatedAt() {
+	public Instant getCreatedAt() {
 		return createdAt;
 	}
 
-	public void setCreatedAt(LocalDateTime createdAt) {
+	public void setCreatedAt(Instant createdAt) {
 		this.createdAt = createdAt;
 	}
 
diff --git a/src/main/java/org/example/team6backend/notification/entity/Notification.java b/src/main/java/org/example/team6backend/notification/entity/Notification.java
index ea42ab4..fff6668 100644
--- a/src/main/java/org/example/team6backend/notification/entity/Notification.java
+++ b/src/main/java/org/example/team6backend/notification/entity/Notification.java
@@ -4,7 +4,7 @@
 import org.example.team6backend.incident.entity.Incident;
 import org.example.team6backend.user.entity.AppUser;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @Entity
 @Table(name = "notification")
@@ -21,7 +21,7 @@ public class Notification {
 	private boolean read = false;
 
 	@Column(name = "created_at", nullable = false)
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 
 	@ManyToOne
 	@JoinColumn(name = "user_id", nullable = false)
@@ -33,7 +33,7 @@ public class Notification {
 
 	@PrePersist
 	public void onCreate() {
-		this.createdAt = LocalDateTime.now();
+		this.createdAt = Instant.now();
 	}
 
 	public Long getId() {
@@ -60,11 +60,11 @@ public void setRead(boolean read) {
 		this.read = read;
 	}
 
-	public LocalDateTime getCreatedAt() {
+	public Instant getCreatedAt() {
 		return createdAt;
 	}
 
-	public void setCreatedAt(LocalDateTime createdAt) {
+	public void setCreatedAt(Instant createdAt) {
 		this.createdAt = createdAt;
 	}
 
diff --git a/src/main/java/org/example/team6backend/user/dto/UserResponse.java b/src/main/java/org/example/team6backend/user/dto/UserResponse.java
index 578c97d..25f1697 100644
--- a/src/main/java/org/example/team6backend/user/dto/UserResponse.java
+++ b/src/main/java/org/example/team6backend/user/dto/UserResponse.java
@@ -2,8 +2,8 @@
 
 import org.example.team6backend.user.entity.UserRole;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 public record UserResponse(String id, String githubId, String githubLogin, String email, String name, UserRole role,
-		String avatarUrl, boolean active, LocalDateTime createdAt, LocalDateTime updatedAt) {
+		String avatarUrl, boolean active, Instant createdAt, Instant updatedAt) {
 }
diff --git a/src/main/java/org/example/team6backend/user/entity/AppUser.java b/src/main/java/org/example/team6backend/user/entity/AppUser.java
index aa1326e..7795cc8 100644
--- a/src/main/java/org/example/team6backend/user/entity/AppUser.java
+++ b/src/main/java/org/example/team6backend/user/entity/AppUser.java
@@ -18,7 +18,7 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 
@@ -58,21 +58,21 @@ public class AppUser implements UserDetails {
 	private boolean active = true;
 
 	@Column(name = "created_at", nullable = false, updatable = false)
-	private LocalDateTime createdAt;
+	private Instant createdAt;
 
 	@Column(name = "updated_at", nullable = false)
-	private LocalDateTime updatedAt;
+	private Instant updatedAt;
 
 	@PrePersist
 	protected void onCreate() {
-		LocalDateTime now = LocalDateTime.now();
+		Instant now = Instant.now();
 		this.createdAt = now;
 		this.updatedAt = now;
 	}
 
 	@PreUpdate
 	protected void onUpdate() {
-		this.updatedAt = LocalDateTime.now();
+		this.updatedAt = Instant.now();
 	}
 
 	@Override
diff --git a/src/main/resources/db/migration/V10__change_timestamp_to_timestampz.sql b/src/main/resources/db/migration/V10__change_timestamp_to_timestampz.sql
new file mode 100644
index 0000000..1b8f873
--- /dev/null
+++ b/src/main/resources/db/migration/V10__change_timestamp_to_timestampz.sql
@@ -0,0 +1,20 @@
+ALTER TABLE incident
+ALTER COLUMN created_at TYPE TIMESTAMPTZ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE comment
+ALTER COLUMN created_at TYPE TIMESTAMPTZ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE activity_log
+ALTER COLUMN created_at TYPE TIMESTAMPTZ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE app_user
+ALTER COLUMN created_at TYPE TIMESTAMPTZ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE app_user
+ALTER COLUMN updated_at TYPE TIMESTAMPTZ USING updated_at AT TIME ZONE 'UTC';
+
+ALTER TABLE incident
+ALTER COLUMN updated_at TYPE TIMESTAMPTZ USING updated_at AT TIME ZONE 'UTC';
+
+ALTER TABLE notification
+ALTER COLUMN created_at TYPE TIMESTAMPTZ USING created_at AT TIME ZONE 'UTC';
\ No newline at end of file
diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html
index 7e1c9e9..2926868 100644
--- a/src/main/resources/templates/admin.html
+++ b/src/main/resources/templates/admin.html
@@ -1196,7 +1196,7 @@ <h3>Assign Incident to Handler</h3>
                         ${user.active ? 'Active' : 'Inactive'}
                     </span>
                 </td>
-                <td style="font-size: 0.8rem;">${new Date(user.createdAt).toLocaleDateString()}</td>
+                <td style="font-size: 0.8rem;">${formatDate(user.createdAt)}</td>
                 <td>
                     <div class="action-buttons">
                         ${user.role === 'PENDING' ?
@@ -1344,7 +1344,7 @@ <h3>Assign Incident to Handler</h3>
                 `<span class="unassigned">Unassigned</span>`
             }
                 </td>
-                <td style="font-size: 0.8rem;">${new Date(incident.createdAt).toLocaleDateString()}</td>
+                <td style="font-size: 0.8rem;">${formatDate(incident.createdAt)}</td>
                 <td>
                     <div class="action-buttons">
                         ${actionButton}
@@ -1656,6 +1656,18 @@ <h3>Assign Incident to Handler</h3>
         div.textContent = text;
         return div.innerHTML;
     }
+
+    function formatDate(dateString) {
+        if (!dateString) return "-";
+
+        return new Date(dateString).toLocaleString("sv-SE", {
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+            hour: "2-digit",
+            minute: "2-digit"
+        });
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
index ddbf2cb..dac0831 100644
--- a/src/main/resources/templates/dashboard.html
+++ b/src/main/resources/templates/dashboard.html
@@ -819,7 +819,7 @@ <h3>Recent incidents</h3>
                         <div class="incident-item" onclick="window.location.href='/incidents/${i.id}'" style="cursor:pointer;">
                             <div>
                                 <div class="incident-title">${escapeHtml(i.subject)}</div>
-                                <div class="incident-date">${new Date(i.createdAt).toLocaleDateString()}</div>
+                                <div class="incident-date">${formatDate(i.createdAt)}</div>
                             </div>
                             <span class="incident-status status-${i.incidentStatus}">${i.incidentStatus}</span>
                         </div>
@@ -949,7 +949,7 @@ <h3>Recent incidents</h3>
             container.innerHTML = notifications.map(notification => `
                 <button class="notification-item" onclick="openNotification(${notification.id}, ${notification.incidentId})">
                     <div class="notification-message">${escapeHtml(notification.message)}</div>
-                    <div class="notification-date">${new Date(notification.createdAt).toLocaleDateString()}</div>
+                    <div class="notification-date">${formatDate(notification.createdAt)}</div>
                 </button>
             `).join('');
         } catch (error) {
@@ -977,6 +977,18 @@ <h3>Recent incidents</h3>
         }
     }
 
+    function formatDate(dateString) {
+        if (!dateString) return "-";
+
+        return new Date(dateString).toLocaleString("sv-SE", {
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+            hour: "2-digit",
+            minute: "2-digit"
+        });
+    }
+
     document.addEventListener('DOMContentLoaded', () => {
         if (userActive && userRole !== 'PENDING') {
             loadIncidents();
diff --git a/src/main/resources/templates/incidents.html b/src/main/resources/templates/incidents.html
index 957aa37..dd68208 100644
--- a/src/main/resources/templates/incidents.html
+++ b/src/main/resources/templates/incidents.html
@@ -268,7 +268,7 @@ <h2 id="title">Loading...</h2>
                     <div class="incident-footer">
                         <span>ID: ${incident.id}</span>
                         <span>Status: <span style="display: inline-block; padding: 0.25rem 0.5rem; border-radius: 9999px; font-size: 0.7rem; font-weight: 500; background: ${statusColor}; color: white;">${status}</span></span>
-                        <span>Created: ${new Date(incident.createdAt).toLocaleDateString()}</span>
+                        <span>Created: ${formatDate(incident.createdAt)}</span>
 
                         <div style="display: flex; gap: 0.5rem;">
                             <button class="btn" onclick="viewIncident(${incident.id})">View</button>
@@ -356,6 +356,18 @@ <h2 id="title">Loading...</h2>
             .replaceAll("'", "&#039;");
     }
 
+    function formatDate(dateString) {
+        if (!dateString) return "-";
+
+        return new Date(dateString).toLocaleString("sv-SE", {
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+            hour: "2-digit",
+            minute: "2-digit"
+        });
+    }
+
     loadIncidents();
 </script>
 </body>
diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html
index cfcd972..7504503 100644
--- a/src/main/resources/templates/profile.html
+++ b/src/main/resources/templates/profile.html
@@ -254,7 +254,7 @@ <h2 th:text="${user.name != null ? user.name : user.githubLogin}">User Name</h2>
 
             <div class="info-group">
                 <div class="info-label">Account Created</div>
-                <div class="info-value" th:text="${#temporals.format(user.createdAt, 'yyyy-MM-dd HH:mm')}">-</div>
+                <div class="info-value" id="accountCreated" th:attr="data-created-at=${user.createdAt}" >-</div>
             </div>
 
             <div th:if="${role == 'PENDING'}" class="pending-note">
@@ -269,6 +269,27 @@ <h2 th:text="${user.name != null ? user.name : user.githubLogin}">User Name</h2>
         await fetch('/logout', { method: 'POST' });
         window.location.href = '/';
     }
+
+    function formatDate(dateString) {
+        if (!dateString) return "-";
+
+        return new Date(dateString).toLocaleString("sv-SE", {
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+            hour: "2-digit",
+            minute: "2-digit"
+        });
+    }
+
+    document.addEventListener("DOMContentLoaded", () => {
+        const accountCreated = document.getElementById("accountCreated");
+        const createdAt = accountCreated?.dataset.createdAt;
+
+        if (accountCreated && createdAt) {
+            accountCreated.textContent = formatDate(createdAt);
+        }
+    });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/viewincident.html b/src/main/resources/templates/viewincident.html
index bc17134..000bbd7 100644
--- a/src/main/resources/templates/viewincident.html
+++ b/src/main/resources/templates/viewincident.html
@@ -352,7 +352,7 @@ <h2>Incident details</h2>
 
         const date = new Date(dateString)
 
-        return date.toLocaleDateString("sv-SE", {
+        return date.toLocaleString("sv-SE", {
             year: "numeric",
             month: "short",
             day: "numeric",
diff --git a/src/test/java/org/example/team6backend/user/service/UserServiceTest.java b/src/test/java/org/example/team6backend/user/service/UserServiceTest.java
index ebefe60..328b59e 100644
--- a/src/test/java/org/example/team6backend/user/service/UserServiceTest.java
+++ b/src/test/java/org/example/team6backend/user/service/UserServiceTest.java
@@ -9,7 +9,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @ExtendWith(MockitoExtension.class)
 @DisplayName("UserService Tests")
@@ -30,8 +30,8 @@ private AppUser createTestUser() {
 		user.setName("Test User");
 		user.setRole(UserRole.RESIDENT);
 		user.setActive(true);
-		user.setCreatedAt(LocalDateTime.now());
-		user.setUpdatedAt(LocalDateTime.now());
+		user.setCreatedAt(Instant.now());
+		user.setUpdatedAt(Instant.now());
 		return user;
 	}
 }