diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index de3f939200..ae3045175e 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -314,7 +314,6 @@ build_child_pipeline:
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
     BUILD_AND_TEST_ALL_APPS: $BUILD_AND_TEST_ALL_APPS
     REPORT_EXIT_CODE: $REPORT_EXIT_CODE
-    OOCD_DISTRO_URL: ${OOCD_DISTRO_URL:-}
   # https://gitlab.com/gitlab-org/gitlab/-/issues/214340
   inherit:
     variables: false
diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index aa087f0255..23642e7b0b 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -198,13 +198,21 @@ variables:
   fi
 
   # Custom OpenOCD
-  if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then
-    echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
-    wget $OOCD_DISTRO_URL
-    ARCH_NAME=$(basename $OOCD_DISTRO_URL)
-    tar -x -f $ARCH_NAME
-    export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
-    export PATH=$PWD/openocd-esp32/bin:$PATH
+  if [[ "$CI_JOB_STAGE" == "target_test" ]]; then
+    machine="$(uname -m)"
+    if [[ "$machine" == "armv7l" ]] ; then
+      OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARMHF"
+    elif [[ "$machine" == "aarch64" ]] ; then
+      OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARM64"
+    fi
+    if [[ ! -z "$OOCD_DISTRO_URL" ]]; then
+      echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
+      wget $OOCD_DISTRO_URL
+      ARCH_NAME=$(basename $OOCD_DISTRO_URL)
+      tar -x -f $ARCH_NAME
+      export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
+      export PATH=$PWD/openocd-esp32/bin:$PATH
+    fi
   fi
 
   if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 5dc66bef8c..1a9454698a 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -165,6 +165,8 @@ pipeline_variables:
       if [ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]; then
         echo "BUILD_AND_TEST_ALL_APPS=1" >> pipeline.env
       fi
+    - echo "OOCD_DISTRO_URL_ARMHF=$OOCD_DISTRO_URL_ARMHF" >> pipeline.env
+    - echo "OOCD_DISTRO_URL_ARM64=$OOCD_DISTRO_URL_ARM64" >> pipeline.env
     - python tools/ci/ci_process_description.py
     - cat pipeline.env
     - python tools/ci/artifacts_handler.py upload --type modified_files_and_components_report
diff --git a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
index 420ee18fec..2629a05aec 100644
--- a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+++ b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
@@ -57,6 +57,9 @@
     ENV_MARKERS: ""
     INSTALL_EXTRA_TOOLS: "xtensa-esp-elf-gdb riscv32-esp-elf-gdb openocd-esp32 esp-rom-elfs"
     PYTEST_EXTRA_FLAGS: "--dev-passwd ${ETHERNET_TEST_PASSWORD} --dev-user ${ETHERNET_TEST_USER} --capture=fd --verbosity=0 --unity-test-report-mode merge"
+  needs:
+    - pipeline: $PARENT_PIPELINE_ID
+      job: pipeline_variables
   cache:
     # Usually do not need submodule-cache in target_test
     - key: pip-cache-${LATEST_GIT_TAG}
diff --git a/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml b/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml
index 66f17fde01..329fcedba0 100644
--- a/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml
+++ b/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml
@@ -38,7 +38,6 @@ Pytest Target Test Jobs:
   needs:
     - generate_pytest_child_pipeline
   variables:
-    OOCD_DISTRO_URL: ${OOCD_DISTRO_URL:-}
     PARENT_PIPELINE_ID: $PARENT_PIPELINE_ID
     REPORT_EXIT_CODE: $REPORT_EXIT_CODE
   # https://gitlab.com/gitlab-org/gitlab/-/issues/214340