diff --git a/vars/buildRpm.groovy b/vars/buildRpm.groovy
index ea2f2e0ad..37b0d4ff7 100755
--- a/vars/buildRpm.groovy
+++ b/vars/buildRpm.groovy
@@ -64,14 +64,10 @@ Map call(Map config = [:]) {
         env_vars = ' CHROOT_NAME=' + config['chroot_name']
     }
 
-    String https_proxy = ''
-    if (env.DAOS_HTTPS_PROXY) {
-        https_proxy = "${env.DAOS_HTTPS_PROXY}"
-    }
-    if (https_proxy) {
-        env_vars += ' HTTPS_PROXY=' + https_proxy
-    }
-
+    env_vars += (env.DAOS_HTTPS_PROXY ? \
+        ' HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '"' : '')
+    env_vars += (env.DAOS_NO_PROXY ? \
+        ' NO_PROXY="' + env.DAOS_NO_PROXY + '"' : '')
     String error_stage_result = 'FAILURE'
     String error_build_result = 'FAILURE'
     if (config['unstable']) {
diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy
index eb05fe057..1fd778393 100644
--- a/vars/dockerBuildArgs.groovy
+++ b/vars/dockerBuildArgs.groovy
@@ -70,11 +70,8 @@ String call(Map config = [:]) {
         String https_proxy = ''
         if (env.DAOS_HTTPS_PROXY) {
             println "DAOS_HTTPS_PROXY: $DAOS_HTTPS_PROXY"
-            https_proxy = env.DAOS_HTTPS_PROXY
-        }
-        if (https_proxy) {
-            ret_str += ' --build-arg HTTPS_PROXY' + '="' + https_proxy + '"'
-            ret_str += ' --build-arg DAOS_HTTPS_PROXY' + '="' + https_proxy + '"'
+            ret_str += ' --build-arg HTTPS_PROXY' + '="' + env.DAOS_HTTPS_PROXY + '"'
+            ret_str += ' --build-arg DAOS_HTTPS_PROXY' + '="' + env.DAOS_HTTPS_PROXY + '"'
         } else {
             println "WARNING: Missing DAOS_HTTPS_PROXY variable in Docker build arguments"
         }
diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy
index d96b81972..0c74329c1 100644
--- a/vars/provisionNodes.groovy
+++ b/vars/provisionNodes.groovy
@@ -166,12 +166,6 @@ Map call(Map config = [:]) {
     default:
             error "Unsupported distro type: ${distro_type}/distro: ${distro}"
     }
-    String https_proxy = ''
-    if (env.DAOS_HTTPS_PROXY) {
-        https_proxy = "${env.DAOS_HTTPS_PROXY}"
-    } else if (env.HTTPS_PROXY) {
-        https_proxy = "${env.HTTPS_PROXY}"
-    }
     provision_script += ' ' +
                       'NODESTRING=' + nodeString + ' ' +
                       'CONFIG_POWER_ONLY=' + config_power_only + ' ' +
@@ -181,7 +175,8 @@ Map call(Map config = [:]) {
                       // https://issues.jenkins.io/browse/JENKINS-55819
                       'CI_RPM_TEST_VERSION="' + (params.CI_RPM_TEST_VERSION ?: '') + '" ' +
                       'CI_PR_REPOS="' + (params.CI_PR_REPOS ?: '') + '" ' +
-                      'HTTPS_PROXY="' + https_proxy + '" ' +
+                      ((env.DAOS_HTTPS_PROXY ?: env.HTTPS_PROXY) ?
+                          'HTTPS_PROXY="' + (env.DAOS_HTTPS_PROXY ?: env.HTTPS_PROXY) + '" ' : '') +
                       'ci/provisioning/post_provision_config.sh'
     new_config['post_restore'] = provision_script
     try {
diff --git a/vars/runTestFunctionalV2.groovy b/vars/runTestFunctionalV2.groovy
index 985f21b46..bf53e4b6e 100644
--- a/vars/runTestFunctionalV2.groovy
+++ b/vars/runTestFunctionalV2.groovy
@@ -57,6 +57,8 @@ Map call(Map config = [:]) {
                        'NODE_COUNT="' + config['node_count'] + '" ' +
                        'OPERATIONS_EMAIL="' + env.OPERATIONS_EMAIL + '" ' +
                        "WITH_VALGRIND=${stage_info.get('with_valgrind', '')} " +
+                       (env.DAOS_HTTPS_PROXY ? 'DAOS_HTTPS_PROXY="' + env.DAOS_HTTPS_PROXY + '" ' : '') +
+                       (env.DAOS_NO_PROXY ? 'DAOS_NO_PROXY="' + env.DAOS_NO_PROXY + '" ' : '') +
                        'ci/functional/test_main.sh'
 
     String basedir = 'install/lib/daos/TESTING/ftest/avocado/job-results/'