diff --git a/services/tunefby/current/app/src/agebd_tunefby/service.py b/services/tunefby/current/app/src/agebd_tunefby/service.py
index 160777d..24650b0 100644
--- a/services/tunefby/current/app/src/agebd_tunefby/service.py
+++ b/services/tunefby/current/app/src/agebd_tunefby/service.py
@@ -3,7 +3,7 @@ from time import perf_counter
 import numpy as np
 from epics import dbr
 
-from agebd.pv import get_pv_class
+from agebd.pv import get_pv_class, get_pv_external_class
 from agebd.service.base import BaseService
 from agebd.service.pvs import BasePVs
 from agebd.utils import printgetversion
@@ -11,6 +11,7 @@ from agebd.utils import printgetversion
 __version__ = printgetversion(__file__)
 
 PV = get_pv_class()
+PV_EXTERNAL = get_pv_external_class()
 
 
 class PVs(BasePVs):
@@ -41,21 +42,21 @@ class PVs(BasePVs):
     qy_stepsiz = PV("AGEBD-TUNEBUMP:QY-STEPSIZE.VAL")
 
     ## Service specific PVs from other IOCs
-    inj_active = PV("AGEBD-PARAMS:INJECTION-ACTIVE.VAL")
-    dump_valve = PV("ARS01-VVPG-0210:PLC_STATUS.VAL")
-    hor_pinger_trig = PV("AGETI-CVME-MASTER-TMA:Evt-SR-Pinger-H-Ena-Sel.VAL")
-    ver_pinger_trig = PV("AGETI-CVME-MASTER-TMA:Evt-SR-Pinger-V-Ena-Sel.VAL")
-    cur = PV("ARS07-DPCT-0000:CURR.VAL")
-    bpm_qy_pilot_int = PV("ARS07-DBPM-5530:PILOT-INT-SWITCH.VAL")  # must be: 0 No Pilot
-    bpm_qy_pilot_ext = PV("ARS07-DBPM-5530:PILOT-EXT-SWITCH.VAL")  # must be: 0 No Pilot
-    bpm_qy_chopper = PV("ARS07-DBPM-5530:CHOPPER-MODE.VAL")  # must be: 0 Periodic
+    inj_active = PV_EXTERNAL("AGEBD-PARAMS:INJECTION-ACTIVE.VAL")
+    dump_valve = PV_EXTERNAL("ARS01-VVPG-0210:PLC_STATUS.VAL")
+    hor_pinger_trig = PV_EXTERNAL("AGETI-CVME-MASTER-TMA:Evt-SR-Pinger-H-Ena-Sel.VAL")
+    ver_pinger_trig = PV_EXTERNAL("AGETI-CVME-MASTER-TMA:Evt-SR-Pinger-V-Ena-Sel.VAL")
+    cur = PV_EXTERNAL("ARS07-DPCT-0000:CURR.VAL")
+    bpm_qy_pilot_int = PV_EXTERNAL("ARS07-DBPM-5530:PILOT-INT-SWITCH.VAL")  # must be: 0 No Pilot
+    bpm_qy_pilot_ext = PV_EXTERNAL("ARS07-DBPM-5530:PILOT-EXT-SWITCH.VAL")  # must be: 0 No Pilot
+    bpm_qy_chopper = PV_EXTERNAL("ARS07-DBPM-5530:CHOPPER-MODE.VAL")  # must be: 0 Periodic
 
     def __init__(self, service_name: str, pv_factory=PV):
         super().__init__(service_name, pv_factory)
         PV = pv_factory
 
         # usually it is advisable to trigger the mainloop of a service on changes of certain PVs:
-        self.CallbackPV = PV("AGEBD-TUNEBUMP:QY.VAL", auto_monitor=dbr.DBE_VALUE)
+        self.CallbackPV = PV_EXTERNAL("AGEBD-TUNEBUMP:QY.VAL", auto_monitor=dbr.DBE_VALUE)
 
 
 class PID: