diff --git a/tasks/configure_tmux.yml b/tasks/configure_tmux.yml
index ed396781f3d6645e8506a9b5f447fdca3c5a8326..777545e9d6aa00eeed6821c0461ad5916565f357 100644
--- a/tasks/configure_tmux.yml
+++ b/tasks/configure_tmux.yml
@@ -11,7 +11,10 @@
       set -g mouse on
       set -g history-limit 10000
   when:
-    (ansible_os_family == "Debian")
+    ( ansible_os_family == "Debian" ) or
+    (( ansible_os_family == 'RedHat' ) and
+     ( ansible_distribution_major_version == "8" ))
+
 
 - name: Enable mouse mode in tmux, increase scrollback buffer to 10.000 (older OSses)
   ansible.builtin.blockinfile:
@@ -34,5 +37,5 @@
       set -g mode-mouse on
 
       set -g history-limit 10000
-  when:
-    ansible_os_family == "RedHat"
+  when: ( ansible_os_family == 'RedHat' ) and
+        ( ansible_distribution_major_version == "7" )