diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59e2b0e00..57ad6beb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# 2024.4.0
+## (2024-04-02)
+
+* Declare ESR 2024.4.0
+
 # v5.1.54+rev1
 ## (2024-03-17)
 
diff --git a/VERSION b/VERSION
index ef97dbde4..d6d6d28db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.1.54+rev1
\ No newline at end of file
+2024.4.0
\ No newline at end of file
diff --git a/layers/meta-balena b/layers/meta-balena
index 2cef02167..84e352b88 160000
--- a/layers/meta-balena
+++ b/layers/meta-balena
@@ -1 +1 @@
-Subproject commit 2cef02167e0e780d1e96da0f801f1f4d5e27e79f
+Subproject commit 84e352b883b0b8dc3e65358cf1e057f275563e98
diff --git a/repo.yml b/repo.yml
index 3aed590e2..b30d7ad24 100644
--- a/repo.yml
+++ b/repo.yml
@@ -1,10 +1,11 @@
----
-type: 'yocto-based OS image'
+esr:
+  version: '2024.4'
 reviewers: 1
+type: yocto-based OS image
 upstream:
-  - repo: 'layers/meta-balena'
-    url: 'http://github.com/balena-os/meta-balena'
-  - repo: 'balena-yocto-scripts'
-    url: 'http://github.com/balena-os/balena-yocto-scripts'
-  - repo: 'contracts'
-    url: 'https://github.com/balena-io/contracts.git'
+- repo: layers/meta-balena
+  url: http://github.com/balena-os/meta-balena
+- repo: balena-yocto-scripts
+  url: http://github.com/balena-os/balena-yocto-scripts
+- repo: contracts
+  url: https://github.com/balena-io/contracts.git