diff --git a/siriuspy/siriuspy/clientconfigdb/types/as_diagnostics.py b/siriuspy/siriuspy/clientconfigdb/types/as_diagnostics.py
index 6557e70ea..a9fa50b0b 100644
--- a/siriuspy/siriuspy/clientconfigdb/types/as_diagnostics.py
+++ b/siriuspy/siriuspy/clientconfigdb/types/as_diagnostics.py
@@ -132,8 +132,23 @@ def get_dict():
     'IA-20RaBPM:TI-AMCFPGAEVR:',
     'IA-20RaBPMTL:TI-AMCFPGAEVR:',
     ]
-_amcfpgaevr_amcs = ['AMC3', 'AMC6']
 _amcfpgaevr_propts = [
+    ['DevEnbl-Sel', 1, 0.0],
+    ['RTMFreqPropGain-SP', 1, 0.0],
+    ['RTMFreqIntgGain-SP', 128, 0.0],
+    ['RTMPhasePropGain-SP', 100, 0.0],
+    ['RTMPhaseIntgGain-SP', 1, 0.0],
+    ['RTMPhaseNavg-SP', 0, 0.0],
+    ['RTMPhaseDiv-SP', 0, 0.0],
+    ['AFCFreqPropGain-SP', 1, 0.0],
+    ['AFCFreqIntgGain-SP', 1500, 0.0],
+    ['AFCPhasePropGain-SP', 10, 0.0],
+    ['AFCPhaseIntgGain-SP', 1, 0.0],
+    ['AFCPhaseNavg-SP', 7, 0.0],
+    ['AFCPhaseDiv-SP', 1, 0.0],
+]
+_amcfpgaevr_amcs = ['AMC3', 'AMC6']
+_amcfpgaevr_amcs_propts = [
     ['State-Sel', 1, 0.0],
     ['Src-Sel', 3, 0.0],
     ['Dir-Sel', 0, 0.0],
@@ -145,8 +160,12 @@ def get_dict():
     ]
 _amcfpgaevr_pvs = list()
 for dev in _amcfpgaevrs:
+    # for AFC and RTM freq loops
+    for ppt, val, dly in _amcfpgaevr_propts:
+        _amcfpgaevr_pvs.append([dev+ppt, val, dly])
+    # for AMCs
     for amc in _amcfpgaevr_amcs:
-        for ppt, val, dly in _amcfpgaevr_propts:
+        for ppt, val, dly in _amcfpgaevr_amcs_propts:
             _amcfpgaevr_pvs.append([dev+amc+ppt, val, dly])
 
 _bpms = [