diff --git a/app/scripts/ansible/roles/haproxy/tasks/main.yml b/app/scripts/ansible/roles/haproxy/tasks/main.yml
index fab1afae..9feaafe6 100644
--- a/app/scripts/ansible/roles/haproxy/tasks/main.yml
+++ b/app/scripts/ansible/roles/haproxy/tasks/main.yml
@@ -17,6 +17,7 @@
   yum:
     name: epel-release
     state: latest
+    disable_gpg_check: yes
   when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0
   ignore_errors: yes
   environment:
@@ -30,6 +31,7 @@
       - http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
       - socat
     state: present
+    disable_gpg_check: yes
   when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0
   ignore_errors: yes
   register: install_result
diff --git a/app/scripts/ansible/roles/haproxy/templates/haproxy.service.j2 b/app/scripts/ansible/roles/haproxy/templates/haproxy.service.j2
index 3424a19a..1d03bd35 100644
--- a/app/scripts/ansible/roles/haproxy/templates/haproxy.service.j2
+++ b/app/scripts/ansible/roles/haproxy/templates/haproxy.service.j2
@@ -5,7 +5,8 @@ After=network.target
 [Service]
 EnvironmentFile=-/etc/default/haproxy
 EnvironmentFile=-/etc/sysconfig/haproxy
-Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "EXTRAOPTS=-S /run/haproxy-master.sock"
+Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" {% if ansible_facts['distribution_major_version'] != '8' %}"EXTRAOPTS=-S /run/haproxy-master.sock"{% endif %}
+
 ExecStartPre=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS
 ExecStart=/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS
 ExecReload=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS