diff --git a/.dictionary b/.dictionary
index 6cdf09478020ff0f2b8385c1fa3248fd100c0e76..b8b4b3b02884f5de6b178ffe34205ef4fb2bfda3 100644
--- a/.dictionary
+++ b/.dictionary
@@ -26,6 +26,7 @@ corstone
 corstone1000
 cpio
 crypto
+DHCP
 dialout
 distro
 DISTROOVERRIDES
@@ -47,6 +48,7 @@ gitlab
 gitlab-ciyml
 gzio
 homepageping
+hostname
 IMAGE_FSTYPES
 initscripts
 kernelcfg
@@ -102,6 +104,7 @@ sourceparams
 sp
 srcurifile
 suggestedvar
+systemd
 tarbz2
 TF-A
 THISDIR
diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
index a94957d5fb2e14c2e64b26efd28a7dd02e174582..4f7d52ed616283c3cb424eabb48fe7f1dc17861a 100644
--- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
+++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
@@ -5,3 +5,7 @@
 
 # Due to performance limitations, add wait-online helper
 IMAGE_INSTALL:append:cassini = " wait-online"
+
+# Since the host has two stage booting, we need to ensure we
+# only get a single ip address for the same MAC incase of reboot
+IMAGE_INSTALL:append:cassini = " send-no-hostname"