diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index a46fad25..e18a52f2 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -209,6 +209,11 @@ def main():
     if re.match('^idm-sto\d-qa-', host_info["fqdn"]):
         modules["sunet"]["tag"] = "jocar-idm-*"
 
+    qa_exceptions = ['nic.komreg.net', 'jmp.komreg.net', 'md1.komreg.net']
+
+    if ".qa." in host_info["fqdn"] or host_info["fqdn"] in qa_exceptions:
+        modules["sunet"]["tag"] = "eidas-qa-2*"
+
     # Build list of expected file content
     file_lines = create_file_content(modules)