diff --git a/.travis.yml b/.travis.yml
index 8faa400..19b8192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
   - git clone https://github.com/oceanprotocol/barge
   - cd barge
   - export AQUARIUS_VERSION=unstable
-  - export BRIZO_VERSION=v0.9.5
+  - export BRIZO_VERSION=v0.9.7
   - export KEEPER_VERSION=v0.13.2
   - export EVENTS_HANDLER_VERSION=v0.4.7
   - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts
index 9e0b9d5..d6b3740 100644
--- a/src/ocean/OceanAssets.ts
+++ b/src/ocean/OceanAssets.ts
@@ -477,7 +477,8 @@ export class OceanAssets extends Instantiable {
     public async createAccessServiceAttributes(
         consumerAccount: Account,
         price: string,
-        datePublished: string
+        datePublished: string,
+        timeout: number = 0
     ): Promise<ServiceAccess> {
         const { templates } = this.ocean.keeper
         const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate()
@@ -491,7 +492,7 @@ export class OceanAssets extends Instantiable {
                     creator: consumerAccount.getId(),
                     datePublished,
                     price,
-                    timeout: 3600,
+                    timeout: timeout,
                     name: 'dataAssetAccessServiceAgreement'
                 },
                 serviceAgreementTemplate
diff --git a/src/ocean/OceanCompute.ts b/src/ocean/OceanCompute.ts
index 331f16d..0f332e8 100644
--- a/src/ocean/OceanCompute.ts
+++ b/src/ocean/OceanCompute.ts
@@ -266,7 +266,8 @@ export class OceanCompute extends Instantiable {
     public async createComputeServiceAttributes(
         consumerAccount: Account,
         price: string,
-        datePublished: string
+        datePublished: string,
+        timeout: number = 3600
     ): Promise<ServiceCompute> {
         const { templates } = this.ocean.keeper
         const serviceAgreementTemplate = await templates.escrowComputeExecutionTemplate.getServiceAgreementTemplate()
@@ -281,7 +282,7 @@ export class OceanCompute extends Instantiable {
                     creator: consumerAccount.getId(),
                     datePublished,
                     price,
-                    timeout: 3600,
+                    timeout: timeout,
                     name
                 },
                 serviceAgreementTemplate