diff --git a/Jenkinsfile b/Jenkinsfile
index d716510bfe..4afb3964f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -194,7 +194,7 @@ node {
           ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"],
           ["test power draw", "pytest -s system/hardware/tici/tests/test_power_draw.py"],
           ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib pytest system/loggerd/tests/test_encoder.py"],
-          ["test pigeond", "pytest system/sensord/tests/test_pigeond.py"],
+          ["test pigeond", "pytest system/ubloxd/tests/test_pigeond.py"],
           ["test manager", "pytest selfdrive/manager/test/test_manager.py"],
         ])
       },
diff --git a/release/files_common b/release/files_common
index e483620052..94af70eff2 100644
--- a/release/files_common
+++ b/release/files_common
@@ -182,6 +182,7 @@ system/hardware/pc/hardware.py
 
 system/ubloxd/.gitignore
 system/ubloxd/SConscript
+system/ubloxd/pigeond.py
 system/ubloxd/generated/*
 system/ubloxd/*.h
 system/ubloxd/*.cc
@@ -241,7 +242,6 @@ system/sensord/SConscript
 system/sensord/sensors_qcom2.cc
 system/sensord/sensors/*.cc
 system/sensord/sensors/*.h
-system/sensord/pigeond.py
 
 system/webrtc/__init__.py
 system/webrtc/webrtcd.py
diff --git a/selfdrive/manager/process_config.py b/selfdrive/manager/process_config.py
index 4f292917fd..5c8dffb2be 100644
--- a/selfdrive/manager/process_config.py
+++ b/selfdrive/manager/process_config.py
@@ -73,7 +73,7 @@ procs = [
   PythonProcess("pandad", "selfdrive.boardd.pandad", always_run),
   PythonProcess("paramsd", "selfdrive.locationd.paramsd", only_onroad),
   NativeProcess("ubloxd", "system/ubloxd", ["./ubloxd"], ublox, enabled=TICI),
-  PythonProcess("pigeond", "system.sensord.pigeond", ublox, enabled=TICI),
+  PythonProcess("pigeond", "system.ubloxd.pigeond", ublox, enabled=TICI),
   PythonProcess("plannerd", "selfdrive.controls.plannerd", only_onroad),
   PythonProcess("radard", "selfdrive.controls.radard", only_onroad),
   PythonProcess("thermald", "selfdrive.thermald.thermald", always_run),
diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py
index 4be9b8a430..250534bf86 100755
--- a/selfdrive/test/test_onroad.py
+++ b/selfdrive/test/test_onroad.py
@@ -65,7 +65,7 @@ PROCS.update({
   "tici": {
     "./boardd": 4.0,
     "./ubloxd": 0.02,
-    "system.sensord.pigeond": 6.0,
+    "system.ubloxd.pigeond": 6.0,
   },
   "tizi": {
      "./boardd": 19.0,
diff --git a/system/sensord/pigeond.py b/system/ubloxd/pigeond.py
similarity index 100%
rename from system/sensord/pigeond.py
rename to system/ubloxd/pigeond.py
diff --git a/system/sensord/tests/test_pigeond.py b/system/ubloxd/tests/test_pigeond.py
similarity index 100%
rename from system/sensord/tests/test_pigeond.py
rename to system/ubloxd/tests/test_pigeond.py