diff --git a/contracts/sw.os+hw.device-type/debian+jetson-agx-orin-devkit/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+jetson-agx-orin-devkit/distro-config.tpl
index 1edf723b..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/debian+jetson-agx-orin-devkit/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/debian+jetson-agx-orin-devkit/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.1 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.1 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall
diff --git a/contracts/sw.os+hw.device-type/debian+jetson-orin-nano-devkit-nvme/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+jetson-orin-nano-devkit-nvme/distro-config.tpl
index 6f3baf6c..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/debian+jetson-orin-nano-devkit-nvme/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/debian+jetson-orin-nano-devkit-nvme/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.3 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.3 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall
diff --git a/contracts/sw.os+hw.device-type/debian+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
index 9834b7e8..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/debian+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/debian+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.2 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.2 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall
diff --git a/contracts/sw.os+hw.device-type/ubuntu+jetson-agx-orin-devkit/distro-config.tpl b/contracts/sw.os+hw.device-type/ubuntu+jetson-agx-orin-devkit/distro-config.tpl
index 1edf723b..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/ubuntu+jetson-agx-orin-devkit/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/ubuntu+jetson-agx-orin-devkit/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.1 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.1 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall
diff --git a/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nano-devkit-nvme/distro-config.tpl b/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nano-devkit-nvme/distro-config.tpl
index 6f3baf6c..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nano-devkit-nvme/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nano-devkit-nvme/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.3 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.3 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall
diff --git a/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl b/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
index 9834b7e8..ea566bd5 100644
--- a/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
+++ b/contracts/sw.os+hw.device-type/ubuntu+jetson-orin-nx-xavier-nx-devkit/distro-config.tpl
@@ -1,4 +1,4 @@
-RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.2 main" >>  /etc/apt/sources.list.d/nvidia.list \
-	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.2 main" >>  /etc/apt/sources.list.d/nvidia.list \
+RUN echo "deb https://repo.download.nvidia.com/jetson/common r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
+	&& echo "deb https://repo.download.nvidia.com/jetson/t234 r35.4 main" >>  /etc/apt/sources.list.d/nvidia.list \
 	&& apt-key adv --fetch-key http://repo.download.nvidia.com/jetson/jetson-ota-public.asc \
 	&& mkdir -p /opt/nvidia/l4t-packages/ && touch /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall