diff --git a/agent_based/checkpoint_vsx_system.py b/agent_based/checkpoint_vsx_system.py
index 171320a1b98e3efe823ee4354059e908a9592e75..ffaec8434f48e5de8f0ee911dc22c14939ee6935 100644
--- a/agent_based/checkpoint_vsx_system.py
+++ b/agent_based/checkpoint_vsx_system.py
@@ -17,6 +17,9 @@
 # 2021-09-06: rewritten for CMK 2.0
 # 2021-09-07: added WATO for check and discovery function
 #             renamed from checkpoint_vsx to checkpoint_vsx_system
+# 2021-09-21: changed graph definition for packets graph to stack
+# 2021-09-24: changed graph definition for connections graph to make it scale with
+#             the active connections (suggested by raulcurro[at]gmail[dot]com)
 #
 # snmpwalk sample
 #
diff --git a/checkpoint_vsx_system.mkp b/checkpoint_vsx_system.mkp
index e60d912aa55f449c14a436a7318aae75142ed593..006c6c9f50cdbde8c77afe5b78330e910451ce97 100644
Binary files a/checkpoint_vsx_system.mkp and b/checkpoint_vsx_system.mkp differ
diff --git a/packages/checkpoint_vsx_system b/packages/checkpoint_vsx_system
index ebf407ff5ed4e4e59990542e7b90840dbdfba495..e3a3b19c1bb681d4d2aa1b671813c855a98eb69d 100644
--- a/packages/checkpoint_vsx_system
+++ b/packages/checkpoint_vsx_system
@@ -15,7 +15,7 @@
  'name': 'checkpoint_vsx_system',
  'num_files': 3,
  'title': 'Check Point VSX system status and counter',
- 'version': '20210921.v.0.3a',
+ 'version': '20210924.v.0.3b',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file
diff --git a/web/plugins/metrics/checkpoint_vsx_system.py b/web/plugins/metrics/checkpoint_vsx_system.py
index 37560585392e82ecffba9be9f68c7aa0dd626343..8c338955c2e019f6783065c922b20e80087187b4 100644
--- a/web/plugins/metrics/checkpoint_vsx_system.py
+++ b/web/plugins/metrics/checkpoint_vsx_system.py
@@ -16,6 +16,7 @@ from cmk.gui.plugins.metrics import (
     metric_info,
     graph_info,
     perfometer_info,
+    check_metrics,
 )
 
 metric_info['checkpoint_vsx_connections'] = {
@@ -77,19 +78,21 @@ metric_info['checkpoint_vsx_loggs_send'] = {
     'color': '14/a',
 }
 
+check_metrics['check_mk-checkpoint_vsx_system'] = {
+    'checkpoint_vsx_connections_peak':  {'auto_graph': False},
+    'checkpoint_vsx_connections_limit':  {'auto_graph': False},
+}
+
 graph_info['checkpoint_vsx_connections'] = {
     'title': _('Check Point VSX: Connections'),
     'metrics': [
-        ('checkpoint_vsx_connections_limit', 'line'),
-        ('checkpoint_vsx_connections_peak', 'line'),
         ('checkpoint_vsx_connections', 'area'),
     ],
     'scalars': [
         ('checkpoint_vsx_connections:crit', _('crit')),
         ('checkpoint_vsx_connections:warn', _('warn')),
-    ],
-    'optional_metrics': [
-        'checkpoint_vsx_connections_limit'
+        ('checkpoint_vsx_connections_limit', _('limit')),
+        ('checkpoint_vsx_connections_peak', _('peak')),
     ],
 }