diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts
index 9e0b9d5..bec9ff3 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()
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