diff --git a/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/gnss_replay.service b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/gnss_replay.service
new file mode 100644
index 0000000..1cc3647
--- /dev/null
+++ b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/gnss_replay.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mock GNSS Host Agent
+After=coqos-virtio-console.service
+
+[Service]
+ExecStartPre=/bin/sh -c 'while [ ! -e /run/gnss-uart ]; do sleep 0.2; done'
+ExecStart=/usr/bin/python3 /usr/bin/gnss_replay.py -s /run/gnss-uart -i /usr/share/gnss/test.csv
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/multi-user.target.wants/gnss_replay.service b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/multi-user.target.wants/gnss_replay.service
new file mode 120000
index 0000000..ebb1d0c
--- /dev/null
+++ b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/etc/systemd/system/multi-user.target.wants/gnss_replay.service
@@ -0,0 +1 @@
+/etc/systemd/system/gnss_replay.service
\ No newline at end of file
diff --git a/hal/gnss/host/gnss_replay.py b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/bin/gnss_replay.py
similarity index 100%
rename from hal/gnss/host/gnss_replay.py
rename to agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/bin/gnss_replay.py
diff --git a/hal/gnss/host/gnss_log_test.csv b/agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/share/gnss/test.csv
similarity index 100%
rename from hal/gnss/host/gnss_log_test.csv
rename to agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/share/gnss/test.csv
diff --git a/hal/gnss/host/gnss_replay.py b/hal/gnss/host/gnss_replay.py
new file mode 120000
index 0000000..74bd48a
--- /dev/null
+++ b/hal/gnss/host/gnss_replay.py
@@ -0,0 +1 @@
+../../../agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/bin/gnss_replay.py
\ No newline at end of file
diff --git a/hal/gnss/host/test.csv b/hal/gnss/host/test.csv
new file mode 120000
index 0000000..3325376
--- /dev/null
+++ b/hal/gnss/host/test.csv
@@ -0,0 +1 @@
+../../../agl_services_build/yocto-layer/meta-google/recipes-trout/images/machine-image/sa81x5/google-overlay/usr/share/gnss/test.csv
\ No newline at end of file