diff --git a/defaults/main.yml b/defaults/main.yml
index 405ffa79..9b4405a6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -120,6 +120,7 @@ redis_config_additional: ""
 ## Redis sentinel configs
 # Set this to true on a host to configure it as a Sentinel
 redis_sentinel: false
+redis_sentinel_service_name: "sentinel_{{ redis_sentinel_port }}"
 redis_sentinel_protected_mode: "yes"
 redis_sentinel_dir: /var/lib/redis/sentinel_{{ redis_sentinel_port }}
 redis_sentinel_bind: 0.0.0.0
@@ -127,7 +128,7 @@ redis_sentinel_port: 26379
 redis_sentinel_password: false
 redis_sentinel_pidfile: /var/run/redis/sentinel_{{ redis_sentinel_port }}.pid
 redis_sentinel_logfile: '""'
-redis_sentinel_syslog_ident: sentinel_{{ redis_sentinel_port }}
+redis_sentinel_syslog_ident: "{{ redis_sentinel_service_name }}"
 redis_sentinel_oom_score_adjust: 0
 redis_sentinel_monitors:
   - name: master01
diff --git a/handlers/main.yml b/handlers/main.yml
index 7719b322..98bacfd9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -7,6 +7,6 @@
 
 - name: "restart sentinel"
   service:
-    name: sentinel_{{ redis_sentinel_port }}
+    name: "{{ redis_sentinel_service_name }}"
     state: restarted
   when: redis_as_service
diff --git a/tasks/sentinel.yml b/tasks/sentinel.yml
index dc389d57..b8bba0d4 100644
--- a/tasks/sentinel.yml
+++ b/tasks/sentinel.yml
@@ -9,7 +9,7 @@
 - name: create sentinel init script
   template:
     src: "{{ item }}"
-    dest: /etc/init.d/sentinel_{{ redis_sentinel_port }}
+    dest: /etc/init.d/{{ redis_sentinel_service_name }}
     mode: 0755
   # Choose the distro-specific template. We must specify the templates
   # path here because with_first_found tries to find files in files/
@@ -24,7 +24,7 @@
 - name: create sentinel systemd service
   template:
     src: "{{ item }}"
-    dest: /etc/systemd/system/sentinel_{{ redis_sentinel_port }}.service
+    dest: /etc/systemd/system/{{ redis_sentinel_service_name }}.service
     mode: 0644
   with_first_found:
     - files:
@@ -55,7 +55,7 @@
 
 - name: set sentinel to start at boot
   service:
-    name: sentinel_{{ redis_sentinel_port }}
+    name: "{{ redis_sentinel_service_name }}"
     enabled: yes
   when: redis_as_service
 
@@ -105,21 +105,21 @@
 - name: create sentinel config file
   template:
     src: redis_sentinel.conf.j2
-    dest: /etc/redis/sentinel_{{ redis_sentinel_port }}.conf
+    dest: /etc/redis/{{ redis_sentinel_service_name }}.conf
     owner: "{{ redis_user }}"
     mode: 0640
   notify: "restart sentinel"
 
 - name: add sentinel init config file
   template:
-    dest: /etc/sysconfig/sentinel_{{ redis_sentinel_port }}
+    dest: /etc/sysconfig/{{ redis_sentinel_service_name }}
     src: redis.init.conf.j2
   when: ansible_os_family == "RedHat"
   notify: "restart sentinel"
 
 - name: add sentinel init config file
   template:
-    dest: /etc/default/sentinel_{{ redis_sentinel_port }}
+    dest: /etc/default/{{ redis_sentinel_service_name }}
     src: redis.init.conf.j2
   when: ansible_os_family == "Debian"
   notify: "restart sentinel"
@@ -131,6 +131,6 @@
 
 - name: ensure sentinel is running
   service:
-    name: sentinel_{{ redis_sentinel_port }}
+    name: "{{ redis_sentinel_service_name }}"
     state: started
   when: redis_as_service
diff --git a/templates/Debian/redis_sentinel.init.j2 b/templates/Debian/redis_sentinel.init.j2
index 9ee1b158..be4bd4f2 100644
--- a/templates/Debian/redis_sentinel.init.j2
+++ b/templates/Debian/redis_sentinel.init.j2
@@ -4,14 +4,14 @@
 #
 #
 ### BEGIN INIT INFO
-# Provides:          sentinel_{{ redis_sentinel_port }}
+# Provides:          {{ redis_sentinel_service_name }}
 # Required-Start:    $network $local_fs $remote_fs
 # Required-Stop:     $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Should-Start:      $syslog $named
 # Should-Stop:       $syslog $named
-# Short-Description: Start and stop sentinel_{{ redis_sentinel_port }}
+# Short-Description: Start and stop {{ redis_sentinel_service_name }}
 # Description:       Redis Sentinel monitor
 ### END INIT INFO
 
diff --git a/templates/default/redis_sentinel.service.j2 b/templates/default/redis_sentinel.service.j2
index a8593d52..90214b6e 100644
--- a/templates/default/redis_sentinel.service.j2
+++ b/templates/default/redis_sentinel.service.j2
@@ -5,8 +5,8 @@ Documentation=http://redis.io/documentation, man:redis-sentinel(1)
 
 [Service]
 Type={{ 'forking' if redis_daemonize == 'yes' else 'simple' }}
-ExecStart={{ redis_install_dir }}/bin/redis-server /etc/redis/sentinel_{{ redis_sentinel_port }}.conf --sentinel
-EnvironmentFile=-/etc/default/sentinel_{{ redis_sentinel_port }}
+ExecStart={{ redis_install_dir }}/bin/redis-server /etc/redis/{{ redis_sentinel_service_name }}.conf --sentinel
+EnvironmentFile=-/etc/default/{{ redis_sentinel_service_name }}
 PIDFile={{ redis_sentinel_pidfile }}
 TimeoutStopSec=0
 Restart=always
diff --git a/templates/redis_sentinel.conf.j2 b/templates/redis_sentinel.conf.j2
index 2fc59390..bb665e10 100644
--- a/templates/redis_sentinel.conf.j2
+++ b/templates/redis_sentinel.conf.j2
@@ -1,5 +1,5 @@
 # redis-sentinel {{ redis_version }} configuration file
-# sentinel_{{ redis_sentinel_port }}.conf
+# {{ redis_sentinel_service_name }}.conf
 
 daemonize {{ redis_daemonize }}
 protected-mode {{ redis_sentinel_protected_mode }}