diff --git a/cicd_testing/builtin-xforms.sh b/cicd_testing/builtin-xforms.sh
index 937214c149008ccc886b9c9ae1931d040108497c..b2318ce710d540586f2fd2b7f8e8779bd7a9e9f2 100755
--- a/cicd_testing/builtin-xforms.sh
+++ b/cicd_testing/builtin-xforms.sh
@@ -3,8 +3,8 @@ set -e
 set -x
 
 cd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 cd $PEASOUP_HOME/tests
 
diff --git a/cicd_testing/do-build.sh b/cicd_testing/do-build.sh
index b7edd25150e66354da814b9343f9845f364ff3a0..d11b1e5a26c6b4ddab162411a3fa548f124be7a3 100755
--- a/cicd_testing/do-build.sh
+++ b/cicd_testing/do-build.sh
@@ -13,10 +13,10 @@ whoami
 env|grep CICD
 
 time rsync -a --exclude='.git'  $CICD_TO_TEST_DIR/ /tmp/peasoup_test
-cicd_setup_module_dependency allzp/idapro71.git idapro71
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-cicd_setup_module_dependency allzp/idapro71_sdk.git idapro71_sdk
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+cicd_setup_module_dependency allzp/idapro82sp1py3.git idapro82sp1py3
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+cicd_setup_module_dependency allzp/idapro82_sdk.git idapro82_sdk
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 
 cd /tmp/peasoup_test
 source set_env_vars
diff --git a/cicd_testing/do-prot-bins.sh b/cicd_testing/do-prot-bins.sh
index 1bc20bd86a940ec2376cc2a77c23e6b3ee0eee5b..b9371051c54792b71a224b0da538aefed457b4e2 100755
--- a/cicd_testing/do-prot-bins.sh
+++ b/cicd_testing/do-prot-bins.sh
@@ -4,8 +4,8 @@ set -e
 set -x
 
 pushd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 popd
 
diff --git a/cicd_testing/elfdep.sh b/cicd_testing/elfdep.sh
index 31689b17c56ef3785f8008a970b5d34cd406582f..62202701082f07f4a169bf1eedc5e2579b552811 100755
--- a/cicd_testing/elfdep.sh
+++ b/cicd_testing/elfdep.sh
@@ -3,8 +3,8 @@ set -e
 set -x
 
 cd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 
 cd $PEASOUP_HOME/irdb-libs//libIRDB-elfdep/test/
diff --git a/cicd_testing/go_tests.sh b/cicd_testing/go_tests.sh
index 37566bf9107709bce2bae6ef6c86c68f2b965573..4afe83168001d193e5b7c02d40b52ea61b271e8f 100755
--- a/cicd_testing/go_tests.sh
+++ b/cicd_testing/go_tests.sh
@@ -3,8 +3,8 @@ set -e
 set -x
 
 cd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 
 cd $PEASOUP_HOME/tests/go_test/
diff --git a/cicd_testing/libc_test.sh b/cicd_testing/libc_test.sh
index 14f5fe3e0d0b91f7b3507992168ff154bd8d2cf1..5d6c0bc02c71bdebb3276c44c414203d96a3e007 100755
--- a/cicd_testing/libc_test.sh
+++ b/cicd_testing/libc_test.sh
@@ -3,8 +3,8 @@ set -e
 set -x
 
 cd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 
 cd $PEASOUP_HOME/tests/libc/
diff --git a/cicd_testing/rust_tests.sh b/cicd_testing/rust_tests.sh
index ba08fc0d6d5edd17f04a4abda1e05084492b7091..65cec5495785ba437628539755b5ec63c666ba48 100755
--- a/cicd_testing/rust_tests.sh
+++ b/cicd_testing/rust_tests.sh
@@ -3,8 +3,8 @@ set -e
 set -x
 
 cd /tmp/peasoup_test
-export IDAROOT=$CICD_MODULE_WORK_DIR/idapro71
-export IDASDK=$CICD_MODULE_WORK_DIR/idapro71_sdk
+export IDAROOT=$CICD_MODULE_WORK_DIR/idapro82sp1py3
+export IDASDK=$CICD_MODULE_WORK_DIR/idapro82_sdk
 source set_env_vars
 
 cd $PEASOUP_HOME/tests/rust_test/