diff --git a/roles/totpcgi/files/totpcgi-httpd.conf b/roles/totpcgi/files/totpcgi-httpd.conf
deleted file mode 100644
index caa1c6767f..0000000000
--- a/roles/totpcgi/files/totpcgi-httpd.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-Listen 8443
-<VirtualHost 10.5.126.30:8443 10.5.126.25:8443 10.5.126.26:8443>
-        # Load this module locally here.
-        LoadModule suexec_module modules/mod_suexec.so
-
-	ServerAdmin admin@fedoraproject.org
-	DocumentRoot /var/www/totpcgi
-	ServerName fas-all.phx2.fedoraproject.org:8443
-	ErrorLog /var/log/httpd/totpcgi-error.log
-	SuexecUserGroup totpcgi totpcgi
-
-	# Use this for totp.cgi
-	AddHandler cgi-script .cgi
-	DirectoryIndex index.cgi
-
-	# Or use this for totp.fcgi:
-	#AddHandler fcgid-script .fcgi
-	#DirectoryIndex index.fcgi
-
-	SSLEngine on
-	SSLCertificateFile /etc/pki/totpcgi/totpcgi-server.crt
-	SSLCertificateKeyFile /etc/pki/totpcgi/totpcgi-server.key
-	SSLCACertificateFile /etc/pki/totpcgi/totpcgi-ca.crt
-        SSLHonorCipherOrder On
-        SSLCipherSuite {{ ssl_ciphers }}
-        SSLProtocol {{ ssl_protocols }}
-
-	SSLVerifyClient require
-	SSLVerifyDepth 10
-
-	CustomLog /var/log/httpd/totpcgi-ssl-request-log \
-		"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-	<Directory "/var/www/totpcgi">
-		Options ExecCGI
-	</Directory>
-</VirtualHost>
diff --git a/roles/totpcgi/files/totpcgi-httpd.conf.stg b/roles/totpcgi/files/totpcgi-httpd.conf.stg
deleted file mode 100644
index 4bd0243d91..0000000000
--- a/roles/totpcgi/files/totpcgi-httpd.conf.stg
+++ /dev/null
@@ -1,37 +0,0 @@
-Listen 8443
-<VirtualHost *:8443>
-        # Load this module locally here.
-        LoadModule suexec_module modules/mod_suexec.so
-
-	ServerAdmin admin@fedoraproject.org
-	DocumentRoot /var/www/totpcgi
-	ServerName fas-all.stg.phx2.fedoraproject.org:8443
-	ErrorLog /var/log/httpd/totpcgi-error.log
-	SuexecUserGroup totpcgi totpcgi
-
-	# Use this for totp.cgi
-	AddHandler cgi-script .cgi
-	DirectoryIndex index.cgi
-
-	# Or use this for totp.fcgi:
-	#AddHandler fcgid-script .fcgi
-	#DirectoryIndex index.fcgi
-
-	SSLEngine on
-	SSLCertificateFile /etc/pki/totpcgi/totpcgi-server.crt
-	SSLCertificateKeyFile /etc/pki/totpcgi/totpcgi-server.key
-	SSLCACertificateFile /etc/pki/totpcgi/totpcgi-ca.crt
-        SSLHonorCipherOrder On
-        SSLCipherSuite {{ ssl_ciphers }}
-        SSLProtocol {{ ssl_protocols }}
-
-	SSLVerifyClient require
-	SSLVerifyDepth 10
-
-	CustomLog /var/log/httpd/totpcgi-ssl-request-log \
-		"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-	<Directory "/var/www/totpcgi">
-		Options ExecCGI
-	</Directory>
-</VirtualHost>
diff --git a/roles/totpcgi/files/totpcgi-httpd.conf.vpn b/roles/totpcgi/files/totpcgi-httpd.conf.vpn
deleted file mode 100644
index eb88528e3f..0000000000
--- a/roles/totpcgi/files/totpcgi-httpd.conf.vpn
+++ /dev/null
@@ -1,36 +0,0 @@
-<VirtualHost 192.168.1.38:8443 192.168.1.39:8443 192.168.1.49:8443>
-        # Load this module locally here.
-        LoadModule suexec_module modules/mod_suexec.so
-
-	ServerAdmin admin@fedoraproject.org
-	DocumentRoot /var/www/totpcgi
-	ServerName fas-all.vpn.fedoraproject.org:8443
-	ErrorLog /var/log/httpd/totpcgi-error.log
-	SuexecUserGroup totpcgi totpcgi
-
-	# Use this for totp.cgi
-	AddHandler cgi-script .cgi
-	DirectoryIndex index.cgi
-
-	# Or use this for totp.fcgi:
-	#AddHandler fcgid-script .fcgi
-	#DirectoryIndex index.fcgi
-
-	SSLEngine on
-	SSLCertificateFile /etc/pki/totpcgi/totpcgi-server-vpn.crt
-	SSLCertificateKeyFile /etc/pki/totpcgi/totpcgi-server-vpn.key
-	SSLCACertificateFile /etc/pki/totpcgi/totpcgi-ca.crt
-        SSLHonorCipherOrder On
-        SSLCipherSuite {{ ssl_ciphers }}
-        SSLProtocol {{ ssl_protocols }}
-
-	SSLVerifyClient require
-	SSLVerifyDepth 10
-
-	CustomLog /var/log/httpd/totpcgi-ssl-request-log \
-		"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-	<Directory "/var/www/totpcgi">
-		Options ExecCGI
-	</Directory>
-</VirtualHost>
diff --git a/roles/totpcgi/tasks/main.yml b/roles/totpcgi/tasks/main.yml
index 53cb673694..2020ba5114 100644
--- a/roles/totpcgi/tasks/main.yml
+++ b/roles/totpcgi/tasks/main.yml
@@ -157,7 +157,7 @@
   when: env == "production"
 
 - name: copy totpcgi httpd config
-  copy: >
+  template: >
    src=totpcgi-httpd.conf
    dest=/etc/httpd/conf.d/totpcgi.conf
    owner=root
@@ -199,7 +199,7 @@
   when: env == "production"
 
 - name: copy VPN server cert file over
-  copy: >
+  template: >
    src=totpcgi-httpd.conf.vpn
    dest=/etc/httpd/conf.d/totpcgi-vpn.conf
    owner=root