diff --git a/glusterfs/server/service.sls b/glusterfs/server/service.sls
index 3b9ada4..0a659ff 100644
--- a/glusterfs/server/service.sls
+++ b/glusterfs/server/service.sls
@@ -6,6 +6,28 @@
   pkg.installed:
     - names: {{ server.pkgs }}
 
+{# Backward compatibility issue, remove when old versions (<3.11.3) are not used any more #}
+glusterfs_service_symlink:
+  file.symlink:
+    - name: /etc/init.d/glusterd
+    - target: /etc/init.d/glusterfs-server
+    - require:
+      - pkg: glusterfs_packages
+    - require_in:
+      - service: glusterfs_service
+
+stop_old_glusterfs_service:
+  service.dead:
+    - name: glusterfs-server
+    - enable: False
+    - onchanges:
+      - file: glusterfs_service_symlink
+    - require_in:
+      - service: glusterfs_service
+    - onlyif:
+        ls /etc/init.d/glusterfs-server
+{# end of backward compatibility change #}
+
   {%- if server.recover_peers is defined %}
     {%- for peer_name, peer_data in server.recover_peers.iteritems() %}
       {%- if peer_data.get('enabled', False) and grains.get('fqdn', 'unknown') == peer_name %}
diff --git a/glusterfs/server/setup.sls b/glusterfs/server/setup.sls
index b983810..53e66a7 100644
--- a/glusterfs/server/setup.sls
+++ b/glusterfs/server/setup.sls
@@ -98,7 +98,7 @@
 glusterfs_vol_{{ name }}_{{ key }}:
   cmd.run:
     - name: "gluster volume set '{{ name }}' '{{ key }}' '{{ value }}'"
-    - unless: "gluster volume info '{{ name }}' | grep '{{ key }}: {{ value }}'"
+    - unless: "gluster volume info '{{ name }}' | fgrep '{{ key }}: {{ value }}'"
     - require:
       {%- if force_compatibility %}
       - cmd: glusterfs_vol_{{ name }}