diff --git a/script_support/components/CAPE/DEFAULT/device-tree-overlay/cape-gpios.dtso b/script_support/components/CAPE/DEFAULT/device-tree-overlay/cape-gpios.dtso
index c7f41a813214d4bd4a0962b6a7b5e8a44a6c4bff..a2deb06dc94686cddef070840dbe0e22b8c380f9 100644
--- a/script_support/components/CAPE/DEFAULT/device-tree-overlay/cape-gpios.dtso
+++ b/script_support/components/CAPE/DEFAULT/device-tree-overlay/cape-gpios.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		DEFAULT-CAPE-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		DEFAULT-CAPE-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/CAPE/GPIOS/device-tree-overlay/cape-gpios.dtso b/script_support/components/CAPE/GPIOS/device-tree-overlay/cape-gpios.dtso
index 72a7ff3bf80802d94d40aff90bcd2b1d819b6069..883ec83e40902d8dfa90e2540ec125a16e20cd00 100644
--- a/script_support/components/CAPE/GPIOS/device-tree-overlay/cape-gpios.dtso
+++ b/script_support/components/CAPE/GPIOS/device-tree-overlay/cape-gpios.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		GPIOS-CAPE-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		GPIOS-CAPE-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/CAPE/NONE/device-tree-overlay/cape-gpios.dtso b/script_support/components/CAPE/NONE/device-tree-overlay/cape-gpios.dtso
index 323ec85990c418f7f4d0f0fe420cf8dcb1be4706..dd47d54f2a8155ac68f4baf5e78ab15e0bbf4204 100644
--- a/script_support/components/CAPE/NONE/device-tree-overlay/cape-gpios.dtso
+++ b/script_support/components/CAPE/NONE/device-tree-overlay/cape-gpios.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		MINIMAL-CAPE-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		MINIMAL-CAPE-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/CAPE/ROBOTICS/device-tree-overlay/robotics-cape.dtso b/script_support/components/CAPE/ROBOTICS/device-tree-overlay/robotics-cape.dtso
index 770328fd1c527e6d2bba47511479a261764d97ba..410603857948434379ef7dd04931b9d7e88ed004 100644
--- a/script_support/components/CAPE/ROBOTICS/device-tree-overlay/robotics-cape.dtso
+++ b/script_support/components/CAPE/ROBOTICS/device-tree-overlay/robotics-cape.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		ROBOTICS-CAPE-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		ROBOTICS-CAPE-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso b/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
index f6f3d10dd37b89c14eb51c76cda0bfaf8baf26d7..a786b1b2f8fb03e7b917125933d09936e6e6d19a 100644
--- a/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
+++ b/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
@@ -7,7 +7,7 @@
 
 &{/chosen} {
 	overlays {
-		BOARD-TESTS-M2-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		BOARD-TESTS-M2-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/M2/DEFAULT/device-tree-overlay/pcie.dtso b/script_support/components/M2/DEFAULT/device-tree-overlay/pcie.dtso
index ccd2c770c39a8806b311cd542b681ee2a8be838a..166ec2fd0414e8d402dbba671d8b8acdf4787bd5 100644
--- a/script_support/components/M2/DEFAULT/device-tree-overlay/pcie.dtso
+++ b/script_support/components/M2/DEFAULT/device-tree-overlay/pcie.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		PCIE-M2-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		PCIE-M2-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/M2/NONE/device-tree-overlay/pcie.dtso b/script_support/components/M2/NONE/device-tree-overlay/pcie.dtso
index fa60ac24960cc99f039ebe43cc0bbb7c6e85f5ed..a32a9e0bd584bffea62af9a1c31aeb59b3b73282 100644
--- a/script_support/components/M2/NONE/device-tree-overlay/pcie.dtso
+++ b/script_support/components/M2/NONE/device-tree-overlay/pcie.dtso
@@ -6,6 +6,6 @@
 
 &{/chosen} {
 	overlays {
-		NO-M2-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		NO-M2-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
diff --git a/script_support/components/SYZYGY/BOARD_TESTS_SEEED_STUDIO/device-tree-overlay/syzygy-test-gpios.dtso b/script_support/components/SYZYGY/BOARD_TESTS_SEEED_STUDIO/device-tree-overlay/syzygy-test-gpios.dtso
index e752a68f090f95675e90466c133b9fcaa5813969..7d2201d0388c31aa1b46df004bdf706006befdc9 100644
--- a/script_support/components/SYZYGY/BOARD_TESTS_SEEED_STUDIO/device-tree-overlay/syzygy-test-gpios.dtso
+++ b/script_support/components/SYZYGY/BOARD_TESTS_SEEED_STUDIO/device-tree-overlay/syzygy-test-gpios.dtso
@@ -6,7 +6,7 @@
 
 &{/chosen} {
 	overlays {
-		BOARD-TESTS-SYZYGY-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		BOARD-TESTS-SYZYGY-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };
 
diff --git a/script_support/components/SYZYGY/NONE/device-tree-overlay/syzygy.dtso b/script_support/components/SYZYGY/NONE/device-tree-overlay/syzygy.dtso
index 9327cee68102a1ad5c6d5f52efdb17cc2a19be0b..14f30efb3ab1f0b830f0e03a97515badb15557df 100644
--- a/script_support/components/SYZYGY/NONE/device-tree-overlay/syzygy.dtso
+++ b/script_support/components/SYZYGY/NONE/device-tree-overlay/syzygy.dtso
@@ -6,6 +6,6 @@
 
 &{/chosen} {
 	overlays {
-		NO-SYZYGY-GATEWARE = "Mon Oct  2 18:00:17 2023";
+		NO-SYZYGY-GATEWARE = "GATEWARE_GIT_VERSION";
 	};
 };