diff --git a/tkn/infra-aws-fedora.yaml b/tkn/infra-aws-fedora.yaml
index e644426a1..9638141a3 100644
--- a/tkn/infra-aws-fedora.yaml
+++ b/tkn/infra-aws-fedora.yaml
@@ -128,6 +128,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
 
   results:
     - name: host-access-secret
@@ -198,6 +200,10 @@ spec:
             cmd+="--airgap "
           fi
           cmd+="--tags $(params.tags) "
+          
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:      
diff --git a/tkn/infra-aws-mac.yaml b/tkn/infra-aws-mac.yaml
index 9bebc7c91..7f10b3ad8 100644
--- a/tkn/infra-aws-mac.yaml
+++ b/tkn/infra-aws-mac.yaml
@@ -121,6 +121,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
 
   results:
     - name: host-access-secret
@@ -197,6 +199,9 @@ spec:
             cmd+="--airgap "
           fi
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:      
diff --git a/tkn/infra-aws-rhel.yaml b/tkn/infra-aws-rhel.yaml
index 4f3b20a4d..a32f538fb 100644
--- a/tkn/infra-aws-rhel.yaml
+++ b/tkn/infra-aws-rhel.yaml
@@ -152,6 +152,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
 
   results:
     - name: host-access-secret
@@ -234,6 +236,9 @@ spec:
           fi
           if [[ $(params.airgap) == "true" ]]; then cmd+="--airgap "; fi
           if [[ $(params.profile-snc) == "true" ]]; then cmd+="--snc "; fi
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
           cmd+="--tags $(params.tags) "
         fi
         eval "${cmd}"
diff --git a/tkn/infra-aws-windows-server.yaml b/tkn/infra-aws-windows-server.yaml
index 5b9943c6c..aa400e468 100644
--- a/tkn/infra-aws-windows-server.yaml
+++ b/tkn/infra-aws-windows-server.yaml
@@ -118,6 +118,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
 
   results:
     - name: host-access-secret
@@ -188,6 +190,9 @@ spec:
           fi
           if [[ $(params.airgap) == "true" ]]; then cmd+="--airgap "; fi
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:      
diff --git a/tkn/infra-azure-aks.yaml b/tkn/infra-azure-aks.yaml
index 4b82025d6..d02d022d2 100644
--- a/tkn/infra-azure-aks.yaml
+++ b/tkn/infra-azure-aks.yaml
@@ -112,6 +112,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
     
   results:
     - name: cluster-access-secret
@@ -177,6 +179,9 @@ spec:
             cmd+="--spot --spot-eviction-tolerance $(params.spot-eviction-tolerance) "
           fi
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:
diff --git a/tkn/infra-azure-fedora.yaml b/tkn/infra-azure-fedora.yaml
index adaf26adb..4402ea0de 100644
--- a/tkn/infra-azure-fedora.yaml
+++ b/tkn/infra-azure-fedora.yaml
@@ -121,6 +121,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
     
   results:
     - name: host-access-secret
@@ -189,6 +191,9 @@ spec:
           # Spot tolerance only be applied if spot is enabled
           cmd+="--spot-eviction-tolerance $(params.spot-eviction-tolerance) "
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:
diff --git a/tkn/infra-azure-rhel.yaml b/tkn/infra-azure-rhel.yaml
index 86e6d1c23..9220173ba 100644
--- a/tkn/infra-azure-rhel.yaml
+++ b/tkn/infra-azure-rhel.yaml
@@ -125,6 +125,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
   
   results:
     - name: host-access-secret
@@ -193,6 +195,9 @@ spec:
           # Spot tolerance only be applied if spot is enabled
           cmd+="--spot-eviction-tolerance $(params.spot-eviction-tolerance) "
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"
       resources:      
diff --git a/tkn/infra-azure-windows-desktop.yaml b/tkn/infra-azure-windows-desktop.yaml
index 9f0039ce9..494eeee83 100644
--- a/tkn/infra-azure-windows-desktop.yaml
+++ b/tkn/infra-azure-windows-desktop.yaml
@@ -121,6 +121,8 @@ spec:
         The parameter is intended to add verbosity on the task execution and also print credentials on stdout
         to easily access to remote machice
       default: 'false'
+    - name: timeout
+      default: "8h"
   
   results:
     - name: host-access-secret
@@ -190,6 +192,9 @@ spec:
           # Spot tolerance only be applied if spot is enabled
           cmd+="--spot-eviction-tolerance $(params.spot-eviction-tolerance) "
           cmd+="--tags $(params.tags) "
+          if [[ $(params.timeout) != "" ]]; then
+            cmd+="--timeout $(params.timeout) "
+          fi
         fi
         eval "${cmd}"  
       resources: