diff --git a/global/overlay/etc/puppet/cosmos-modules-prod.conf b/global/overlay/etc/puppet/cosmos-modules-prod.conf
deleted file mode 100644
index dde1a3b8..00000000
--- a/global/overlay/etc/puppet/cosmos-modules-prod.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# name source (puppetlabs fq name or git url) upgrade (yes/no)
-#
-concat      https://github.com/SUNET/puppetlabs-concat.git yes eidas-prod-2*
-stdlib      https://github.com/SUNET/puppetlabs-stdlib.git yes eidas-prod-2*
-cosmos      https://github.com/SUNET/puppet-cosmos.git yes eidas-prod-2*
-ufw         https://github.com/SUNET/puppet-module-ufw.git yes eidas-prod-2*
-apt         https://github.com/SUNET/puppetlabs-apt.git yes eidas-prod-2*
-vcsrepo     https://github.com/SUNET/puppetlabs-vcsrepo.git yes eidas-prod-2*
-xinetd      https://github.com/SUNET/puppetlabs-xinetd.git yes eidas-prod-2*
-python      https://github.com/SUNET/puppet-python.git yes eidas-prod-2*
-hiera-gpg   https://github.com/SUNET/hiera-gpg.git yes eidas-prod-2*
-pound       https://github.com/SUNET/puppet-pound.git yes eidas-prod-2*
-augeas      https://github.com/SUNET/puppet-augeas.git yes eidas-prod-2*
-bastion     https://github.com/SUNET/puppet-bastion.git yes eidas-prod-2*
-pyff        https://github.com/SUNET/puppet-pyff.git yes eidas-prod-2*
-dhcp        https://github.com/SUNET/puppetlabs-dhcp.git yes eidas-prod-2*
-varnish     https://github.com/SUNET/puppet-varnish.git yes eidas-prod-2*
-apparmor    https://github.com/SUNET/puppet-apparmor.git yes eidas-prod-2*
-docker      https://github.com/SUNET/garethr-docker.git yes eidas-prod-2*
-sunet       https://github.com/SUNET/puppet-sunet.git yes eidas-prod-2*
-sysctl      https://github.com/SUNET/puppet-sysctl.git yes eidas-prod-2*
-nagioscfg   https://github.com/SUNET/puppet-nagioscfg.git yes eidas-prod-2*
diff --git a/global/overlay/etc/puppet/cosmos-modules-test.conf b/global/overlay/etc/puppet/cosmos-modules-test.conf
deleted file mode 100644
index f63b33a0..00000000
--- a/global/overlay/etc/puppet/cosmos-modules-test.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# name source (puppetlabs fq name or git url) upgrade (yes/no)
-#
-concat      https://github.com/SUNET/puppetlabs-concat.git yes eidas-test-2*
-stdlib      https://github.com/SUNET/puppetlabs-stdlib.git yes eidas-test-2*
-cosmos      https://github.com/SUNET/puppet-cosmos.git yes eidas-test-2*
-ufw         https://github.com/SUNET/puppet-module-ufw.git yes eidas-test-2*
-apt         https://github.com/SUNET/puppetlabs-apt.git yes eidas-test-2*
-vcsrepo     https://github.com/SUNET/puppetlabs-vcsrepo.git yes eidas-test-2*
-xinetd      https://github.com/SUNET/puppetlabs-xinetd.git yes eidas-test-2*
-python      https://github.com/SUNET/puppet-python.git yes eidas-test-2*
-hiera-gpg   https://github.com/SUNET/hiera-gpg.git yes eidas-test-2*
-pound       https://github.com/SUNET/puppet-pound.git yes eidas-test-2*
-augeas      https://github.com/SUNET/puppet-augeas.git yes eidas-test-2*
-bastion     https://github.com/SUNET/puppet-bastion.git yes eidas-test-2*
-pyff        https://github.com/SUNET/puppet-pyff.git yes eidas-test-2*
-dhcp        https://github.com/SUNET/puppetlabs-dhcp.git yes eidas-test-2*
-varnish     https://github.com/SUNET/puppet-varnish.git yes eidas-test-2*
-apparmor    https://github.com/SUNET/puppet-apparmor.git yes eidas-test-2*
-docker      https://github.com/SUNET/garethr-docker.git yes eidas-test-2*
-sunet       https://github.com/SUNET/puppet-sunet.git yes eidas-test-2*
-sysctl      https://github.com/SUNET/puppet-sysctl.git yes eidas-test-2*
-nagioscfg   https://github.com/SUNET/puppet-nagioscfg.git yes eidas-test-2*
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
deleted file mode 100644
index dde1a3b8..00000000
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# name source (puppetlabs fq name or git url) upgrade (yes/no)
-#
-concat      https://github.com/SUNET/puppetlabs-concat.git yes eidas-prod-2*
-stdlib      https://github.com/SUNET/puppetlabs-stdlib.git yes eidas-prod-2*
-cosmos      https://github.com/SUNET/puppet-cosmos.git yes eidas-prod-2*
-ufw         https://github.com/SUNET/puppet-module-ufw.git yes eidas-prod-2*
-apt         https://github.com/SUNET/puppetlabs-apt.git yes eidas-prod-2*
-vcsrepo     https://github.com/SUNET/puppetlabs-vcsrepo.git yes eidas-prod-2*
-xinetd      https://github.com/SUNET/puppetlabs-xinetd.git yes eidas-prod-2*
-python      https://github.com/SUNET/puppet-python.git yes eidas-prod-2*
-hiera-gpg   https://github.com/SUNET/hiera-gpg.git yes eidas-prod-2*
-pound       https://github.com/SUNET/puppet-pound.git yes eidas-prod-2*
-augeas      https://github.com/SUNET/puppet-augeas.git yes eidas-prod-2*
-bastion     https://github.com/SUNET/puppet-bastion.git yes eidas-prod-2*
-pyff        https://github.com/SUNET/puppet-pyff.git yes eidas-prod-2*
-dhcp        https://github.com/SUNET/puppetlabs-dhcp.git yes eidas-prod-2*
-varnish     https://github.com/SUNET/puppet-varnish.git yes eidas-prod-2*
-apparmor    https://github.com/SUNET/puppet-apparmor.git yes eidas-prod-2*
-docker      https://github.com/SUNET/garethr-docker.git yes eidas-prod-2*
-sunet       https://github.com/SUNET/puppet-sunet.git yes eidas-prod-2*
-sysctl      https://github.com/SUNET/puppet-sysctl.git yes eidas-prod-2*
-nagioscfg   https://github.com/SUNET/puppet-nagioscfg.git yes eidas-prod-2*