diff --git a/roles/fas2discourse/tasks/create-keytab-secret.yml b/roles/fas2discourse/tasks/create-keytab-secret.yml
index 7c4600996b..bbe44cdd80 100644
--- a/roles/fas2discourse/tasks/create-keytab-secret.yml
+++ b/roles/fas2discourse/tasks/create-keytab-secret.yml
@@ -2,7 +2,7 @@
 # generate the templates for project to be created
 - name: create the templates
   ansible.builtin.copy:
-    src: "/etc/openshift_apps/fas2discourse/fas2discourse-keytab.kt"
+    src: "/etc/openshift_apps/fas2discourse/fas2discourse{{ env_suffix }}-keytab.kt"
     dest: "/root/ocp4/openshift-apps/fas2discourse-operator/fas2discourse-keytab.kt"
     mode: 0600
 
diff --git a/roles/fas2discourse/tasks/create-keytab.yml b/roles/fas2discourse/tasks/create-keytab.yml
index 439bae71f4..d45c1b65b8 100644
--- a/roles/fas2discourse/tasks/create-keytab.yml
+++ b/roles/fas2discourse/tasks/create-keytab.yml
@@ -16,7 +16,7 @@
     name: keytab/service
   vars:
     kt_location:
-      "/etc/openshift_apps/fas2discourse/fas2discourse-keytab.kt"
+      "/etc/openshift_apps/fas2discourse/fas2discourse{{ env_suffix }}-keytab.kt"
     service: "fas2discourse"
     host: "{{ fas2discourse_hostname }}"
   tags: