diff --git a/.github/workflows/dhis2-verify-commits.yml.yml b/.github/workflows/dhis2-verify-commits.yml.yml
index 91ad933..3627687 100644
--- a/.github/workflows/dhis2-verify-commits.yml.yml
+++ b/.github/workflows/dhis2-verify-commits.yml.yml
@@ -8,8 +8,11 @@ jobs:
     lint-pr-title:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
-            - uses: c-hive/gha-yarn-cache@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: '20'
+                  cache: 'yarn'
             - run: yarn install --frozen-lockfile
             - id: commitlint
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
@@ -21,10 +24,13 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ !contains(github.event.pull_request.title, '[skip commit-lint]') }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0
-            - uses: c-hive/gha-yarn-cache@v1
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: '20'
+                  cache: 'yarn'
             - run: yarn install --frozen-lockfile
             - id: commitlint
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
diff --git a/i18n/en.pot b/i18n/en.pot
index 24508eb..c37e0a7 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-27T05:56:11.774Z\n"
-"PO-Revision-Date: 2024-08-27T05:56:11.774Z\n"
+"POT-Creation-Date: 2026-05-12T17:09:29.373Z\n"
+"PO-Revision-Date: 2026-05-12T17:09:29.374Z\n"
 
 msgid "Couldn't find a monthly period for weekly period id \"{{periodId}}\""
 msgstr "Couldn't find a monthly period for weekly period id \"{{periodId}}\""
@@ -45,18 +45,12 @@ msgstr ""
 msgid "Unrecognized date, received \"{{date}}\""
 msgstr "Unrecognized date, received \"{{date}}\""
 
-msgid "Year {{year}} is out of range."
-msgstr "Year {{year}} is out of range."
-
-msgid "Month {{month}} is out of range | 1 <= {{month}} <= 12."
-msgstr "Month {{month}} is out of range | 1 <= {{month}} <= 12."
-
-msgid "Day {{day}} is out of range | 1 <= {{day}} <= {{daysInMonth}}."
-msgstr "Day {{day}} is out of range | 1 <= {{day}} <= {{daysInMonth}}."
-
 msgid "Date is not given"
 msgstr "Date is not given"
 
+msgid "Invalid date in specified calendar"
+msgstr "Invalid date in specified calendar"
+
 msgid "Date {{dateString}} is less than the minimum allowed date {{minDateString}}."
 msgstr "Date {{dateString}} is less than the minimum allowed date {{minDateString}}."
 
diff --git a/src/constants/dhis2CalendarsMap.ts b/src/constants/dhis2CalendarsMap.ts
index 50d8f47..5c006c0 100644
--- a/src/constants/dhis2CalendarsMap.ts
+++ b/src/constants/dhis2CalendarsMap.ts
@@ -8,7 +8,7 @@ export const dhis2CalendarsMap: Record<string, SupportedCalendar> = {
     coptic: 'coptic',
     gregorian: 'gregory',
     islamic: 'islamic',
-    iso8601: 'iso8601',
+    iso8601: 'gregory',
     // 'Julian': 'julian', // this is not supported by Temporal
     nepali: 'nepali',
     thai: 'buddhist',