diff --git a/build.toml b/build.toml
index bc3538163..7b39b81f2 100644
--- a/build.toml
+++ b/build.toml
@@ -82,19 +82,19 @@ package_output_dir = 'Built'
 
 [package.payload_map]
 'Built\\Custom Device' = 'documents\National Instruments\NI VeriStand {veristand_version}\Custom Devices\Data Sharing Framework'
-'Built\\Errors' = 'ni-paths-NISHAREDDIR\Errors\English'
+'Built\\Errors' = 'ni-paths-NISHAREDDIR{nipaths_64_bitness_suffix}\Errors\English'
 
 [[package]]
 type = 'nipkg'
 payload_dir = 'Built\Scripting API'
-install_destination = 'ni-paths-LV{veristand_version}DIR\vi.lib\addons\VeriStand Custom Device Scripting APIs\Data Sharing Framework'
+install_destination = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\vi.lib\addons\VeriStand Custom Device Scripting APIs\Data Sharing Framework'
 control_file = 'control_dsf_scripting'
 package_output_dir = 'Built'
 
 [[package]]
 type = 'nipkg'
 payload_dir = 'Built\Scripting Examples'
-install_destination = 'ni-paths-LV{veristand_version}DIR\examples\NI VeriStand Custom Devices\Data Sharing Framework'
+install_destination = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\examples\NI VeriStand Custom Devices\Data Sharing Framework'
 control_file = 'control_dsf_examples'
 package_output_dir = 'Built'
 
diff --git a/control_dsf_cd b/control_dsf_cd
index 4b193b149..cade25732 100644
--- a/control_dsf_cd
+++ b/control_dsf_cd
@@ -12,4 +12,4 @@ XB-UserVisible: yes
 Section: Add-Ons
 XB-DisplayVersion: {display_version}
 XB-DisplayName: NI Data Sharing Framework Custom Device for VeriStand {veristand_version}
-Depends: {ni-veristand-{labview_version}} (>= {labview_short_version}.0.0)
+Depends: ni-veristand-{labview_version} (>= {labview_short_version}.0.0)
diff --git a/control_dsf_scripting b/control_dsf_scripting
index 1f8d80c5b..41bd93aa0 100644
--- a/control_dsf_scripting
+++ b/control_dsf_scripting
@@ -12,5 +12,5 @@ XB-UserVisible: yes
 Section: Add-Ons
 XB-DisplayVersion: {display_version}
 XB-DisplayName: NI Data Sharing Framework LabVIEW Support for VeriStand {veristand_version}
-Depends: {AUTOVERSION_ni-labview-{labview_version}-x86}, {ni-veristand-{labview_version}} (>= {labview_short_version}.0.0), ni-veristand-{veristand_version}-custom-device-labview-support-common (>= 21.0.0)
+Depends: ni-labview-{labview_version}{pkg_x86_bitness_suffix} (>= {labview_short_version}.0.0), ni-veristand-{labview_version} (>= {labview_short_version}.0.0), ni-veristand-{veristand_version}-custom-device-labview-support-common (>= 21.0.0)
 Recommends: ni-data-sharing-framework-veristand-{veristand_version}-support (>= {display_version})