diff --git a/CHANGELOG b/CHANGELOG
index 40bd1b4c5fec007f328d2eda0627ebcf8bf9b60d..cfa55d5ae1cc811c9f8a5af30f4d218f2a1c775c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,3 +6,4 @@
 2022-05-11: changed bgp_get_peer_entry to get proper parameters instead of Nontransparent list
             added remote_as to BgpPeerItem
 2022-05-12: changed IPv6 address format to lower case as required by rfc5952 section-4.3 (this affects IPv6 peers)
+2023-02-18: moved metrics file from ~/local/share/check_mk/... to ~/local/lib/check_mk/...
diff --git a/agent_based/huawei_bgp_peer.py b/agent_based/huawei_bgp_peer.py
index 9e52863d44787f71242569e43a5f079911bdad6a..4bd8bdcabd9a31d6f5cdb4334813d114414b5137 100644
--- a/agent_based/huawei_bgp_peer.py
+++ b/agent_based/huawei_bgp_peer.py
@@ -139,13 +139,13 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer]
             remote_as=remote_as,
             peer_state=state,
             admin_state='2',   # admin_state set to not admin_down
-            in_updates=None,  # in_updates
-            out_updates=None,  # out_updates
-            in_messages=None,  # in_messages
-            out_messages=None,  # out_messages
+            # in_updates=None,  # in_updates
+            # out_updates=None,  # out_updates
+            # in_messages=None,  # in_messages
+            # out_messages=None,  # out_messages
             fsm_established_transitions=fsm_established_counter,
             fsm_established_time=fsm_established_time,
-            in_update_elapsed_time=None,  # in_update_elapsed_time
+            # in_update_elapsed_time=None,  # in_update_elapsed_time
         )
         if bgp_peer:
             afi, safi = oid_end.split('.')[1:3]
diff --git a/gui/metrics/huawei_bgp_peer.py b/gui/metrics/huawei_bgp_peer.py
new file mode 100644
index 0000000000000000000000000000000000000000..e47364894909d4e4eb1d6e71ce87100819ee55cf
--- /dev/null
+++ b/gui/metrics/huawei_bgp_peer.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# License: GNU General Public License v2
+#
+# Author: thl-cmk[at]outlook[dot]com
+# URL   : https://thl-cmk.hopto.org
+# Date  : 2020-06-22
+#
+# Huawei BGP Peer
+#
+# 2020-07-20: added BGP prefix counter
+# 2023-02-18: moved metrics file from ~/local/share/check_mk/... to ~/local/lib/check_mk/...
+#
+
+from cmk.gui.i18n import _
+
+from cmk.gui.plugins.metrics.utils import (
+    metric_info,
+    graph_info,
+)
+
+
+metric_info['bgp_peer_prefixrcvcounter'] = {
+    'title': _('Prefixes received'),
+    'unit': 'count',
+    'color': '11/a',
+}
+metric_info['bgp_peer_prefixactivecounter'] = {
+    'title': _('Prefixes active'),
+    'unit': 'count',
+    'color': '33/a',
+}
+metric_info['bgp_peer_prefixadvcounter'] = {
+    'title': _('Prefixes advertised'),
+    'unit': 'count',
+    'color': '43/a',
+}
+
+graph_info['huawei_bgp_peer_counter'] = {
+    'title': _('BGP prefix counter'),
+    'metrics': [
+        ('bgp_peer_prefixrcvcounter', 'line'),
+        ('bgp_peer_prefixactivecounter', 'line'),
+        ('bgp_peer_prefixadvcounter', 'line'),
+    ]
+}
diff --git a/huawei_bgp_peer.mkp b/huawei_bgp_peer.mkp
index 39d997647efdf6f930e393f2618226df69406709..d5b3e55bdedb0b575c4e8e4877bb6b7de62414ab 100644
Binary files a/huawei_bgp_peer.mkp and b/huawei_bgp_peer.mkp differ
diff --git a/packages/huawei_bgp_peer b/packages/huawei_bgp_peer
index 282801abda45a81652606057917b4ed2f0abb510..e5d73636df4536ecfe609f85f61d0ce4cd93ab2a 100644
--- a/packages/huawei_bgp_peer
+++ b/packages/huawei_bgp_peer
@@ -12,11 +12,10 @@
                 ' \n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['huawei_bgp_peer.py'],
-           'web': ['plugins/metrics/huawei_bgp_peer.py']},
+           'gui': ['metrics/huawei_bgp_peer.py']},
  'name': 'huawei_bgp_peer',
- 'num_files': 2,
  'title': 'Huawei BGP Peer',
- 'version': '20220910.v.0.4a',
- 'version.min_required': '2.0.0',
- 'version.packaged': '2021.09.20',
+ 'version': '20230218.v.0.b',
+ 'version.min_required': '2.1.0',
+ 'version.packaged': '2.1.0p21',
  'version.usable_until': None}
\ No newline at end of file