diff --git a/inventory/group_vars/copr_all_instances_aws b/inventory/group_vars/copr_all_instances_aws
index aa41b7712e..741cf064ad 100644
--- a/inventory/group_vars/copr_all_instances_aws
+++ b/inventory/group_vars/copr_all_instances_aws
@@ -1,5 +1,7 @@
 # Put here configuration for all copr instances (production, devel, ...)
 ---
+
+# TODO: tamplatize main.cf
 smtp_auth_relay_host: smtp-auth-cc-rdu01.fedoraproject.org
 smtp_auth_relay_user: copr@fedoraproject.org
 smtp_auth_relay_password: "{{ copr_smtp_password }}"
diff --git a/roles/base/files/postfix/main.cf/main.cf.copr_smtp_auth_relay b/roles/base/files/postfix/main.cf/main.cf.copr_smtp_auth_relay
index 0adbc4469e..9fe9b817a8 100644
--- a/roles/base/files/postfix/main.cf/main.cf.copr_smtp_auth_relay
+++ b/roles/base/files/postfix/main.cf/main.cf.copr_smtp_auth_relay
@@ -314,7 +314,9 @@ unknown_local_recipient_reject_code = 550
 #relayhost = uucphost
 #relayhost = [an.ip.add.ress]
 
-relayhost = {{ smtp_auth_relay_host }}
+# TODO: tamplatize
+#relayhost = {{ smtp_auth_relay_host }}
+relayhost = smtp-auth-cc-rdu01.fedoraproject.org
 
 smtp_use_tls = yes
 smtp_sasl_auth_enable = yes
diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml
index 6407e74f91..07f3634777 100644
--- a/roles/base/tasks/postfix.yml
+++ b/roles/base/tasks/postfix.yml
@@ -1,5 +1,5 @@
 - name: /etc/postfix/main.cf
-  template: src={{ item }} dest=/etc/postfix/main.cf
+  copy: src={{ item }} dest=/etc/postfix/main.cf
   with_first_found:
     - "{{ postfix_maincf }}"
     - "postfix/main.cf/main.cf.{{ ansible_fqdn }}"
diff --git a/roles/smtp-auth-relay/tasks/main.yml b/roles/smtp-auth-relay/tasks/main.yml
index b10ddd6a80..e8cb2968c5 100644
--- a/roles/smtp-auth-relay/tasks/main.yml
+++ b/roles/smtp-auth-relay/tasks/main.yml
@@ -11,7 +11,7 @@
 - name: create the password file
   copy:
     dest: /etc/postfix/sasl_passwd
-    content: "{{ smtp_auth_relay_host }}  {{ smtp_auth_relay_user }}:{{ smtp_auth_relay_password }}"
+    content: "{{ smtp_auth_relay_host }} {{ smtp_auth_relay_user }}:{{ smtp_auth_relay_password }}"
     mode: 0600
   register: smtp_relay_password_file
   tags:
diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml
index 411b92f68e..4bd6a7dcb1 100644
--- a/tasks/postfix_basic.yml
+++ b/tasks/postfix_basic.yml
@@ -5,7 +5,7 @@
   - packages
 
 - name: /etc/postfix/main.cf
-  template: src={{ item }} dest=/etc/postfix/main.cf
+  copy: src={{ item }} dest=/etc/postfix/main.cf
   with_first_found:
     - "{{ postfix_maincf }}"
     - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ ansible_fqdn }}"