diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
index bce62297df..666dd958d4 100644
--- a/roles/haproxy/tasks/main.yml
+++ b/roles/haproxy/tasks/main.yml
@@ -35,9 +35,9 @@
         dest={{ item.dest }}
         owner=root group=root mode=0600
   with_items:
-  - { file: "ipa{{ env_suffix }}-iad2.pem", dest: /etc/haproxy/ipa.pem }
-  - { file: "os-master{{ env_suffix }}-iad2.pem", dest: /etc/haproxy/os-master.pem }
-  - { file: "ocp{{ env_suffix }}-iad2.pem", dest: "/etc/haproxy/ocp{{ env_suffix }}.pem" }
+  - { file: "ipa.{{env}}-iad2.pem", dest: /etc/haproxy/ipa.pem }
+  - { file: "os-master.{{env}}-iad2.pem", dest: /etc/haproxy/os-master.pem }
+  - { file: "ocp.{{env}}-iad2.pem", dest: "/etc/haproxy/ocp-{{env}}.pem" }
   tags:
   - haproxy