diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 7e6141f32..2687881fc 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -80,6 +80,12 @@ parameters:
     api.users.deprovision.username: lifecycle
     api.users.deprovision.password: secret
 
+    ##########################################################################################
+    ## CLIENT SETTINGS
+    ##########################################################################################
+    ## Currently this is used for the outgoing requests with the PDP and AA client
+    http_client.timeout: 10
+
     ##########################################################################################
     ## PDP SETTINGS
     ##########################################################################################
diff --git a/src/OpenConext/EngineBlockBundle/Resources/config/services.yml b/src/OpenConext/EngineBlockBundle/Resources/config/services.yml
index da7e855aa..e2b0c5ac7 100644
--- a/src/OpenConext/EngineBlockBundle/Resources/config/services.yml
+++ b/src/OpenConext/EngineBlockBundle/Resources/config/services.yml
@@ -202,6 +202,7 @@ services:
               # Verify CAs for certificates for prod, but not for other environments
               # as we are working with self signed signatures
               verify: "@=service('kernel').getEnvironment() === 'prod'"
+              timeout: "%http_client.timeout%"
 
     engineblock.authentication.authentication_loop_guard:
         class: OpenConext\EngineBlockBundle\Authentication\AuthenticationLoopGuard
@@ -255,6 +256,7 @@ services:
         class: GuzzleHttp\Client
         arguments:
             - auth: ["%attribute_aggregation.username%", "%attribute_aggregation.password%", "Basic"]
+              timeout: "%http_client.timeout%"
 
     engineblock.metadata.repository.cached_doctrine:
         class: OpenConext\EngineBlock\Metadata\MetadataRepository\CachedDoctrineMetadataRepository