diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index e63c5743..ce82311c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -339,7 +339,7 @@ class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost')
                    "DEMW_TLS_CLIENT_KEY=$demw_tls_client_key",
                    "DEMW_TLS_CLIENT_CERT=$demw_tls_client_cert",
                    "DEMW_TLS_SERVER_CERT=$demw_tls_server_cert",
-                   "JAVA_OPTS=-DformatMsgNoLookups=true",
+                   'JAVA_OPTS="-DformatMsgNoLookups=true -Dlog4j2.formatMsgNoLookups=true"',
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password"],
       extra_parameters => ["--log-driver=syslog --cpuset-cpus=0-3"]
    }
@@ -393,7 +393,7 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
                    "POSEIDAS_ADMIN_HASHED_PASSWORD=$poseidas_admin_hashed_password",
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password",
                    "MIDDLEWARE_CRYPT_PIN=$middleware_crypt_pin",
-                   "JAVA_OPTS=-DformatMsgNoLookups=true",
+                   'JAVA_OPTS="-DformatMsgNoLookups=true -Dlog4j2.formatMsgNoLookups=true"',
                    "MIDDLEWARE_SIGN_PIN=$middleware_sign_pin"],
       extra_parameters => ["--log-driver=syslog"]
    }