diff --git a/ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml b/ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
index 56981c7155374..e4593a28e809e 100644
--- a/ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
+++ b/ci-operator/step-registry/agent/e2e/generic/conformance/iso-no-registry/agent-e2e-generic-conformance-iso-no-registry-workflow.yaml
@@ -5,6 +5,7 @@ workflow:
     allow_skip_on_success: true
     env:
       DEVSCRIPTS_TARGET: agent
+      DEVSCRIPTS_TARGET_TIMEOUT: 180m
     pre:
       - chain: agent-pre
     test:
diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
index 583267f275dbc..7efe0287fe764 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
@@ -194,7 +194,7 @@ EOF
 scp "${SSHOPTS[@]}" "${SHARED_DIR}/dev-scripts-additional-config" "root@${IP}:dev-scripts-additional-config"
 
 # Use '/auths/ s/.*/' instead of 's/.*auths.*/' to avoid regex backtracking on long log lines
-timeout -s 9 175m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e '/auths/ s/.*/*** PULL_SECRET ***/'
+timeout -s 9 ${DEVSCRIPTS_TIMEOUT:-175m} ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e '/auths/ s/.*/*** PULL_SECRET ***/'
 
 set -xeuo pipefail
 
@@ -437,7 +437,7 @@ fi
 echo 'export KUBECONFIG=\$(ls /root/dev-scripts/ocp/*/auth/kubeconfig)' >> /root/.bashrc
 
 set +e
-timeout -s 9 130m make ${DEVSCRIPTS_TARGET}
+timeout -s 9 ${DEVSCRIPTS_TARGET_TIMEOUT:-130m} make ${DEVSCRIPTS_TARGET}
 rv=\$?
 
 # squid needs to be restarted after network changes
diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
index 1c2669dfcd3e5..fa032c6509a1b 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
+++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml
@@ -20,6 +20,12 @@ ref:
   - name: DEVSCRIPTS_TARGET
     default: ""
     documentation: Defines the makefile target to be executed. See https://github.com/openshift-metal3/dev-scripts/blob/master/Makefile for a list of available targets.
+  - name: DEVSCRIPTS_TARGET_TIMEOUT
+    default: ""
+    documentation: Defines the timeout for the dev-scripts target to be executed.
+  - name: DEVSCRIPTS_TIMEOUT
+    default: ""
+    documentation: Defines the timeout for the dev-scripts setup command.
   - name: AGENT_E2E_TEST_BOOT_MODE
     default: ""
     documentation: Set the boot mode to DISKIMAGE for using the APPLIANCE_IMAGE