diff --git a/fdl-epel-6-i386.cfg b/fdl-epel-6-i386.cfg
index 62dd494..6850cc4 100644
--- a/fdl-epel-6-i386.cfg
+++ b/fdl-epel-6-i386.cfg
@@ -1,78 +1,14 @@
-config_opts['root'] = 'epel-6-i386'
+include('templates/epel-6.tpl')
+
+config_opts['root'] = 'fdl-epel-6-i386'
 config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-# beware: RHEL uses 6Server or 6Client
-config_opts['releasever'] = '6'
-config_opts['use_nspawn'] = False
+
 config_opts['resultdir'] = '/var/www/html/packages/epel/6/i386/'
 config_opts['createrepo_on_rpms'] = True
 config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm'
 
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-mdpolicy=group:primary
-best=1
-
-# repos
-[base]
-name=BaseOS
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=i386&repo=os
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=i386&repo=updates
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[testing]
-name=epel-testing
-enabled=0
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=i386
-failovermethod=priority
-skip_if_unavailable=False
-
-[local]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/i386/
-cost=2000
-enabled=0
-skip_if_unavailable=False
-
-[epel-debuginfo]
-name=epel-debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=i386
-failovermethod=priority
-enabled=0
-skip_if_unavailable=False
+config_opts['yum.conf'] += """
 
 [fdl-epel-local]
 name=Fire Dragon Linux packages for epel $releasever - $basearch
diff --git a/fdl-epel-6-x86_64.cfg b/fdl-epel-6-x86_64.cfg
index 6d902d8..f0ecd89 100644
--- a/fdl-epel-6-x86_64.cfg
+++ b/fdl-epel-6-x86_64.cfg
@@ -1,94 +1,14 @@
-config_opts['root'] = 'epel-6-x86_64'
+include('templates/epel-6.tpl')
+
+config_opts['root'] = 'fdl-epel-6-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-# beware RHEL uses 6Server or 6Client
-config_opts['releasever'] = '6'
-config_opts['use_nspawn'] = False
+
 config_opts['resultdir'] = '/var/www/html/packages/epel/6/x86_64/'
 config_opts['createrepo_on_rpms'] = True
 config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm'
 
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-mdpolicy=group:primary
-best=1
-
-# repos
-[base]
-name=BaseOS
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=os
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=updates
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-6
-gpgcheck=1
-skip_if_unavailable=False
-
-[sclo]
-name=sclo
-baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-gpgcheck=1
-includepkgs=devtoolset*
-skip_if_unavailable=False
-
-[sclo-rh]
-name=sclo-rh
-baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/rh/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-gpgcheck=1
-includepkgs=devtoolset*
-skip_if_unavailable=False
-
-[testing]
-name=epel-testing
-enabled=0
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64
-failovermethod=priority
-skip_if_unavailable=False
-
-[local]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/
-cost=2000
-enabled=0
-skip_if_unavailable=False
-
-[epel-debuginfo]
-name=epel-debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=x86_64
-failovermethod=priority
-enabled=0
-skip_if_unavailable=False
+config_opts['yum.conf'] += """
 
 [fdl-epel-local]
 name=Fire Dragon Linux packages for epel $releasever - $basearch
@@ -105,3 +25,4 @@ enabled=1
 gpgcheck=0
 
 """
+
diff --git a/fdl-epel-7-x86_64.cfg b/fdl-epel-7-x86_64.cfg
index 6592bad..5be4720 100644
--- a/fdl-epel-7-x86_64.cfg
+++ b/fdl-epel-7-x86_64.cfg
@@ -1,99 +1,14 @@
-config_opts['root'] = 'epel-7-x86_64'
+include('templates/epel-7.tpl')
+
+config_opts['root'] = 'fdl-epel-7-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-config_opts['releasever'] = '7'
+
 config_opts['resultdir'] = '/var/www/html/packages/epel/7/x86_64/'
 config_opts['createrepo_on_rpms'] = True
 config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm'
 
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-mdpolicy=group:primary
-best=1
-
-# repos
-[base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-skip_if_unavailable=False
-
-[epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
-skip_if_unavailable=False
-
-[extras]
-name=extras
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=extras
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-skip_if_unavailable=False
-
-[sclo]
-name=sclo
-baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/sclo/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-gpgcheck=1
-includepkgs=devtoolset*
-skip_if_unavailable=False
-
-[sclo-rh]
-name=sclo-rh
-baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/rh/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-gpgcheck=1
-includepkgs=devtoolset*
-skip_if_unavailable=False
-
-[testing]
-name=epel-testing
-enabled=0
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64
-failovermethod=priority
-skip_if_unavailable=False
-
-[local]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/epel7-build/latest/x86_64/
-cost=2000
-enabled=0
-skip_if_unavailable=False
-
-[epel-debuginfo]
-name=epel-debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=x86_64
-failovermethod=priority
-enabled=0
-skip_if_unavailable=False
+config_opts['yum.conf'] += """
 
 [fdl-epel-local]
 name=Fire Dragon Linux packages for epel $releasever - $basearch
diff --git a/fdragon-mock-configs.spec b/fdragon-mock-configs.spec
index fc0b641..8a92f50 100644
--- a/fdragon-mock-configs.spec
+++ b/fdragon-mock-configs.spec
@@ -1,5 +1,5 @@
 Name:           fdragon-mock-configs
-Version:        2020.02.20
+Version:        2020.02.22
 Release:        1%{?dist}
 Summary:        fdragon mock configs
 
@@ -105,6 +105,9 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/31/x86_64/
 
 
 %changelog
+* Thu Feb 22 2020 Jason Rothstein <fdragon@fdragon.org>
+- mock changed the templates for epel 6 and 7
+
 * Thu Feb 20 2020 Jason Rothstein <fdragon@fdragon.org>
 - mock changed the templates from yum.conf to dnf.conf for fedora 30+ and epel 8+