diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg
index cc63b76be8dc923428c16642e4d35701a7ca3535..43165095e3d76d8990351090ce31390a1d088c62 100644
--- a/software/ors-amarisoft/buildout.hash.cfg
+++ b/software/ors-amarisoft/buildout.hash.cfg
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 052168dc9f2ab96e33f8a8b388c35e70
+md5sum = f140d494ab31398bc9e8fc881a30157a
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -72,7 +72,7 @@ md5sum = e22257ef526b0acc10a8203daa41028b
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 44ae59b57fc462fb9bbff218e742d17f
+md5sum = 504df4116e3de7d3e51b13cf9259cf48
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
diff --git a/software/ors-amarisoft/instance-enb.jinja2.cfg b/software/ors-amarisoft/instance-enb.jinja2.cfg
index 0caf61a3adff099096382a358372adecb95ba7e0..c92129ae32a6e0a63f70ed984a347f7aa9324eaf 100644
--- a/software/ors-amarisoft/instance-enb.jinja2.cfg
+++ b/software/ors-amarisoft/instance-enb.jinja2.cfg
@@ -27,8 +27,6 @@ parts =
   sshd-service
   sshd-add-authorized-key
   sshd-promise
-  check-lopcomm-vswr.py
-  check-lopcomm-pa-current.py
   check-lopcomm-pa-output-power.py
   check-lopcomm-lof.py
   check-lopcomm-rssi.py
@@ -562,14 +560,6 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> ru/lopcomm
-[check-lopcomm-pa-current.py]
-<= macro.promise
-promise = check_lopcomm_pa_current
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-
 # XXX -> ru/lopcomm
 [check-lopcomm-pa-output-power.py]
 <= macro.promise
diff --git a/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg b/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
index 730d11e08baac024964c6901718db50feb63e9ec..4871f6cd99c5f6de1f15462e5bb23728f0c44b99 100644
--- a/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
+++ b/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
@@ -44,4 +44,9 @@ hash-files =
 promise = check_lopcomm_vswr
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
+{{ promise('%s-check-pa-current.py' % ru_ref) }}
+promise = check_lopcomm_pa_current
+config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
+
+
 {%- endmacro  %}