diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES
index 6484934496..857339dfe7 100644
--- a/EKSD_LATEST_RELEASES
+++ b/EKSD_LATEST_RELEASES
@@ -33,12 +33,16 @@ releases:
 - branch: 1-28
   kubeVersion: v1.28.15
   number: 38
+  endOfStandardSupport: "2024-12-31"
 - branch: 1-29
   kubeVersion: v1.29.11
   number: 27
+  endOfStandardSupport: "2025-04-30"
 - branch: 1-30
   kubeVersion: v1.30.7
   number: 20
+  endOfStandardSupport: "2025-08-31"
 - branch: 1-31
   kubeVersion: v1.31.3
   number: 9
+  endOfStandardSupport: "2025-12-31"
diff --git a/tools/version-tracker/pkg/commands/upgrade/upgrade.go b/tools/version-tracker/pkg/commands/upgrade/upgrade.go
index 2b8f2a6c6d..c4b9e2699d 100644
--- a/tools/version-tracker/pkg/commands/upgrade/upgrade.go
+++ b/tools/version-tracker/pkg/commands/upgrade/upgrade.go
@@ -652,10 +652,13 @@ func updateUpstreamProjectsTrackerFile(projectsList *types.ProjectsList, buildTo
 	}
 	b.Write([]byte("\n"))
 
-	// Create a new YAML encoder with an appropriate indentation value and encode the project list into a byte buufer
+	// Create a new YAML encoder with an appropriate indentation value and encode the project list into a byte buffer
 	yamlEncoder := goyamlv3.NewEncoder(&b)
 	yamlEncoder.SetIndent(2)
-	yamlEncoder.Encode(&projectsList)
+	err = yamlEncoder.Encode(&projectsList)
+	if err != nil {
+		return fmt.Errorf("encoding the project list into a byte buffer: %v", err)
+	}
 
 	err = os.WriteFile(upstreamProjectsTrackerFilePath, b.Bytes(), 0o644)
 	if err != nil {
diff --git a/tools/version-tracker/pkg/types/types.go b/tools/version-tracker/pkg/types/types.go
index 1eb8933f66..f6b849eedf 100644
--- a/tools/version-tracker/pkg/types/types.go
+++ b/tools/version-tracker/pkg/types/types.go
@@ -67,10 +67,11 @@ type ImageMetadata struct {
 }
 
 type EKSDistroRelease struct {
-	Branch      string `json:"branch"`
-	KubeVersion string `json:"kubeVersion"`
-	Number      int    `json:"number"`
-	Dev         *bool  `json:"dev,omitempty"`
+	Branch               string `json:"branch"`
+	KubeVersion          string `json:"kubeVersion"`
+	Number               int    `json:"number"`
+	Dev                  *bool  `json:"dev,omitempty"`
+	EndOfStandardSupport string `json:"endOfStandardSupport,omitempty"`
 }
 
 type EKSDistroLatestReleases struct {