diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
index f52bb0ba..64233d98 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
@@ -110,3 +110,7 @@ proxy-service.signature-algorithm.natsp.md=${proxy-service.signature-algorithm.n
 
 #Private SP requests from other eIDAS countries
 proxy-service.private-sp.enabled=true
+
+#These configuration properties allow configuration of the HTTP client used to obtain metadata as well as for OpenID connect operations such as retrieving ID tokens and user-info tokens from the OP.
+proxy-service.http.connect-timeout=1000
+proxy-service.http.read-timeout=5000
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
index 020add82..2b1a2473 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
@@ -17,10 +17,6 @@ oidc-config.op.bid-op.op-metadata-location=file://${proxy-service.path.prefix}/m
 oidc-config.op.bid-op.op-jwks-metadata-location=file://${proxy-service.path.prefix}/metadata/oidc/bid-op-jwks.json
 oidc-config.return-url=${proxy-service.domain.prefix}/oidc/return
 
-# HTTP configuration
-http.connect-timeout=1000
-http.read-timeout=5000
-
 # User messages
 user-message.default.sv=Sveriges internationella nod för e-legitimering
 user-message.default.en=Sweden Connect - Cross-border Digital Identification
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 0488b48e..5d21b346 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1136,7 +1136,7 @@ log-1.sveidas.se:
    autoupdate:
    proxy_eidas_metadata:
    eidas_proxy:
-      version: 2.0.4_hsm2
+      version: 3.0.1_hsm2
       hostname: qa.proxy.eidas.swedenconnect.se
       spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION
    sunet::frontend::register_sites:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index b21cbf30..9442a6a7 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -319,6 +319,11 @@ class proxy_eidas_metadata() {
       warning_age => '600',
       critical_age => '172800'
    }
+   sunet::nagios::nrpe_check_fileage {"proxy_eidas_metadata_cache":
+      filename => "/etc/eidas-proxy/se/ps-mdcache/metadata-cache.xml",
+      warning_age => '600',
+      critical_age => '172800'
+   }
 }
 
 class md_repo_server($hostname) {