diff --git a/+adi/Version.m b/+adi/Version.m
index f749edb..e313039 100644
--- a/+adi/Version.m
+++ b/+adi/Version.m
@@ -2,8 +2,8 @@
     % Version
     %   BSP Version information
     properties (Constant)
-        Vivado = '2022.2'
-        MATLAB = 'R2022a'
+        Vivado = getenv('req_vivado_v')
+        MATLAB = getenv('req_matlab_v') 
         Release = '21.2.1'
         AppName = 'Analog Devices, Inc. Precision Toolbox'
         ToolboxName = 'PrecisionToolbox'
diff --git a/pcx_examples/targeting/cn0585/+AnalogDevicesDemo/+cn0585_led_sw_gpio_control_demo/+common/plugin_rd.m b/pcx_examples/targeting/cn0585/+AnalogDevicesDemo/+cn0585_led_sw_gpio_control_demo/+common/plugin_rd.m
index d277e32..2ed7640 100644
--- a/pcx_examples/targeting/cn0585/+AnalogDevicesDemo/+cn0585_led_sw_gpio_control_demo/+common/plugin_rd.m
+++ b/pcx_examples/targeting/cn0585/+AnalogDevicesDemo/+cn0585_led_sw_gpio_control_demo/+common/plugin_rd.m
@@ -21,7 +21,7 @@
 hRD.BoardName = sprintf('AnalogDevices CN0585 GPIO Control');
 
 % Tool information
-hRD.SupportedToolVersion = {'2023.2'};
+hRD.SupportedToolVersion = {getenv('req_vivado_v')};
 
 % Get the root directories
 rootDirExample = fileparts(strtok(mfilename('fullpath'), '+'));
diff --git a/pcx_examples/targeting/cn0585/cn0585_hdl/build_bsp.sh b/pcx_examples/targeting/cn0585/cn0585_hdl/build_bsp.sh
index d8ec41d..b7d13b5 100755
--- a/pcx_examples/targeting/cn0585/cn0585_hdl/build_bsp.sh
+++ b/pcx_examples/targeting/cn0585/cn0585_hdl/build_bsp.sh
@@ -44,8 +44,7 @@ fi
 VIVADO=${VER}
 
 # Setup
-#source /opt/Xilinx/Vivado/$VIVADO/settings64.sh
-source /emea/mediadata/opt/Xilinx/Vivado/$VIVADO/settings64.sh
+source "$vivado_settings_path"
 
 # Rename .prj files since MATLAB ignores then during packaging
 FILES=$(grep -lrn hdl/projects/common -e '.prj' | grep -v Makefile | grep -v .git)
diff --git a/test/BSPTestsBase.m b/test/BSPTestsBase.m
index 6e4f37f..950dea7 100644
--- a/test/BSPTestsBase.m
+++ b/test/BSPTestsBase.m
@@ -161,6 +161,8 @@ function setVivadoPath(~,vivado)
                     pathname = ['C:\Xilinx\Vivado\',vivado,'\bin\vivado.bat'];
                 elseif isunix
                     pathname = ['/emea/mediadata/opt/Xilinx/Vivado/',vivado,'/bin/vivado'];
+                    %pathname = ['/opt/Xilinx/Vivado/',vivado,'/bin/vivado'];
+		    %pathname = getenv('vivado_settings_path');
                 end
             end
             assert(exist(pathname,'file')>0,'Correct version of Vivado is unavailable or in a non-standard location');
@@ -203,4 +205,4 @@ function testMain(testCase, configs, SynthesizeDesign)
             end
         end
     end
-end
\ No newline at end of file
+end
diff --git a/test/build_design.m b/test/build_design.m
index b14c71b..084829b 100755
--- a/test/build_design.m
+++ b/test/build_design.m
@@ -29,7 +29,7 @@
 
 % Specify the top level project directory
 hWC.ProjectFolder = folder;
-hWC.ReferenceDesignToolVersion = '2023.2';
+hWC.ReferenceDesignToolVersion = getenv('req_vivado_v');
 hWC.IgnoreToolVersionMismatch = true;
 hWC.AllowUnsupportedToolVersion = true;