diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cb913001..263a843b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Restructured the response of the portfolio report endpoint (_X-ray_)
+- Modernized the templates with untagged template literals
 - Refactored the create or update access dialog component to standalone
 - Improved the language localization for German (`de`)
 - Upgraded `envalid` from version `8.0.0` to `8.1.0`
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 7a6a6ae87..4e58abf08 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -30,7 +30,7 @@
                   [ngClass]="{
                     'text-line-through': element.role === 'INACTIVE'
                   }"
-                  >{{ (element.id | slice: 0 : 5) + '...' }}</span
+                  >{{ `${(element.id | slice: 0 : 5)}...` }}</span
                 >
                 @if (element.subscription?.expiresAt) {
                   <gf-premium-indicator
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index 7153e2e53..8d5503840 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -26,9 +26,9 @@
           <mat-progress-bar
             mode="determinate"
             [title]="
-              (
+              `${(
                 portfolioDetails?.summary?.filteredValueInPercentage * 100
-              ).toFixed(2) + '%'
+              ).toFixed(2)}%`
             "
             [value]="portfolioDetails?.summary?.filteredValueInPercentage * 100"
           />
diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html
index 3e4784307..2f876b1b1 100644
--- a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html
+++ b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html
@@ -32,10 +32,9 @@
                     personalFinanceTool.name
                   }} - {{ personalFinanceTool.slogan }}"
                   [routerLink]="[
-                    '/' + pathResources,
+                    `/${pathResources}`,
                     pathPersonalFinanceTools,
-                    pathAlternativeTo +
-                      (personalFinanceTool.alias ?? personalFinanceTool.key)
+                    `${pathAlternativeTo}${personalFinanceTool.alias ?? personalFinanceTool.key}`
                   ]"
                 >
                   <div class="flex-grow-1 overflow-hidden">
diff --git a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
index c64d597b5..3c2807146 100644
--- a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
+++ b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
@@ -8,23 +8,23 @@
             class="day"
             [ngClass]="{
               'cursor-pointer valid': isDateOfInterest(
-                itemByMonth.key + '-' + (i + 1 < 10 ? '0' + (i + 1) : i + 1)
+                `${itemByMonth.key}-${i + 1 < 10 ? `0${i + 1}` : i + 1}`
               ),
               available:
                 marketDataByMonth[itemByMonth.key][
-                  i + 1 < 10 ? '0' + (i + 1) : i + 1
+                  i + 1 < 10 ? `0${i + 1}` : i + 1
                 ]?.marketPrice,
               today: isToday(
-                itemByMonth.key + '-' + (i + 1 < 10 ? '0' + (i + 1) : i + 1)
+                `${itemByMonth.key}-${i + 1 < 10 ? `0${i + 1}` : i + 1}`
               )
             }"
             [title]="
-              (itemByMonth.key + '-' + (i + 1 < 10 ? '0' + (i + 1) : i + 1)
+              (`${itemByMonth.key}-${i + 1 < 10 ? `0${i + 1}` : i + 1}`
                 | date: defaultDateFormat) ?? ''
             "
             (click)="
               onOpenMarketDataDetail({
-                day: i + 1 < 10 ? '0' + (i + 1) : i + 1,
+                day: i + 1 < 10 ? `0${i + 1}` : i + 1,
                 yearMonth: itemByMonth.key
               })
             "