diff --git a/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json b/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
index e2564b0..918ecb6 100755
--- a/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
+++ b/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
@@ -601,7 +601,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "glusterfs_space_used{peer=\"^$peer\",volume=~\"^$volume$\"}",
+          "expr": "glusterfs_space_used{peer=~\"^$peer\",volume=~\"^$volume$\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "used ({{ volume }})",
@@ -813,7 +813,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "glusterfs_space_used{peer=\"^$peer\",volume=~\"^$volume$\"}",
+          "expr": "glusterfs_space_used{peer=~\"^$peer\",volume=~\"^$volume$\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "used ({{ volume }})",
@@ -1027,7 +1027,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "glusterfs_space_used{peer=\"^$peer\",volume=~\"^$volume$\"}",
+          "expr": "glusterfs_space_used{peer=~\"^$peer\",volume=~\"^$volume$\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "used ({{ volume }})",
diff --git a/glusterfs/map.jinja b/glusterfs/map.jinja
index 3a943f2..91f46fb 100644
--- a/glusterfs/map.jinja
+++ b/glusterfs/map.jinja
@@ -1,7 +1,14 @@
+{# Backward compatibility issue, remove when old versions (<3.11.3) are not used any more #}
+{% if salt['pkg.version_cmp'](salt['pkg.version']('glusterfs-server'), '3.11.3') >= 0 %}
+    {% set systemd_service = 'glusterd' %}
+{% else %}
+    {% set systemd_service = 'glusterfs-server' %}
+{% endif %}
+
 {% set server = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['glusterfs-server','bc', 'attr'],
-        'service': 'glusterfs-server',
+        'service': systemd_service,
     },
     'RedHat': {
         'pkgs': ['glusterfs-server','bc'],