diff --git a/global/overlay/etc/puppet/modules/eid/manifests/connector.pp b/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
index 95db6412..42152842 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
@@ -41,7 +41,8 @@ class eid::connector (
       content => template("eid/connector/application-${environment}.yml.erb")
     }
 
-    if ($environment == 'qa') {
+    # If we dont use HSM, we need the keys on disk
+    if (unless $use_hsm) {
       sunet::snippets::secret_file {"${connector_directory}/credentials/metadata.key":
         hiera_key => 'eidas_metadata_key',
         base64    => true