diff --git a/carfield.mk b/carfield.mk
index 2b3609078..194f9d877 100644
--- a/carfield.mk
+++ b/carfield.mk
@@ -57,7 +57,7 @@ include $(CAR_ROOT)/bender-safed.mk
 ######################
 
 CAR_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:carfield/carfield-nonfree.git
-CAR_NONFREE_COMMIT ?= 57afcb6
+CAR_NONFREE_COMMIT ?= 1217f1f
 
 ## @section Carfield platform nonfree components
 ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC
diff --git a/requirements.txt b/requirements.txt
index 404a13f62..dae666ee2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 hjson
 jsonref
 jsonschema
-Mako==1.1.6
-PyYAML==6.0
+Mako
+PyYAML
 pyelftools==0.29
 requests
 mako
@@ -14,3 +14,7 @@ mkdocs-material
 mkdocs-glightbox
 dataclasses
 jstyleson
+flatdict
+peakrdl
+peakrdl-rawheader
+setuptools<81
diff --git a/target/xilinx/flavor_bd/scripts/carfield_bd_vcu128.tcl b/target/xilinx/flavor_bd/scripts/carfield_bd_vcu128.tcl
index db9daa915..7edaebb2f 100644
--- a/target/xilinx/flavor_bd/scripts/carfield_bd_vcu128.tcl
+++ b/target/xilinx/flavor_bd/scripts/carfield_bd_vcu128.tcl
@@ -25,7 +25,7 @@ set script_folder [_tcl::get_script_folder]
 ################################################################
 # Check if script is running in correct Vivado version.
 ################################################################
-set scripts_vivado_version 2020.2
+set scripts_vivado_version 2022.1
 set current_vivado_version [version -short]
 
 if { [string first $scripts_vivado_version $current_vivado_version] == -1 } {
@@ -137,7 +137,7 @@ xilinx.com:ip:xlconcat:2.1\
 xilinx.com:ip:ddr4:2.2\
 xilinx.com:ip:xlconstant:1.1\
 xilinx.com:ip:proc_sys_reset:5.0\
-xilinx.com:ip:util_ds_buf:2.1\
+xilinx.com:ip:util_ds_buf:2.2\
 xilinx.com:ip:vio:3.0\
 xilinx.com:ip:smartconnect:1.0\
 xilinx.com:ip:xdma:4.1\
@@ -353,7 +353,7 @@ proc create_root_design { parentCell } {
  ] $psr_333
 
   # Create instance: util_ds_buf_0, and set properties
-  set util_ds_buf_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_ds_buf:2.1 util_ds_buf_0 ]
+  set util_ds_buf_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_ds_buf:2.2 util_ds_buf_0 ]
   set_property -dict [ list \
    CONFIG.C_BUF_TYPE {IBUFDS} \
    CONFIG.DIFF_CLK_IN_BOARD_INTERFACE {Custom} \
@@ -361,7 +361,7 @@ proc create_root_design { parentCell } {
  ] $util_ds_buf_0
 
   # Create instance: util_ds_buf_1, and set properties
-  set util_ds_buf_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_ds_buf:2.1 util_ds_buf_1 ]
+  set util_ds_buf_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_ds_buf:2.2 util_ds_buf_1 ]
   set_property -dict [ list \
    CONFIG.C_BUF_TYPE {IBUFDSGTE} \
    CONFIG.DIFF_CLK_IN_BOARD_INTERFACE {pcie_refclk} \
diff --git a/target/xilinx/scripts/flash_spi.tcl b/target/xilinx/scripts/flash_spi.tcl
index bac8929ff..c40d36335 100644
--- a/target/xilinx/scripts/flash_spi.tcl
+++ b/target/xilinx/scripts/flash_spi.tcl
@@ -8,7 +8,7 @@
 open_hw_manager
 
 connect_hw_server -url $::env(XILINX_HOST):$::env(XILINX_PORT)
-open_hw_target [get_hw_targets $::env(XILINX_FPGA_PATH)]
+open_hw_target [get_hw_targets]
 
 set file $::env(FILE)
 set offset $::env(OFFSET)
diff --git a/target/xilinx/scripts/program.tcl b/target/xilinx/scripts/program.tcl
index c34148fa3..ce715c70a 100644
--- a/target/xilinx/scripts/program.tcl
+++ b/target/xilinx/scripts/program.tcl
@@ -9,7 +9,7 @@ puts $::env(XILINX_BIT)
 open_hw_manager
 
 connect_hw_server -url $::env(XILINX_HOST):$::env(XILINX_PORT)
-open_hw_target [get_hw_targets $::env(XILINX_FPGA_PATH)]
+open_hw_target [get_hw_targets]
 
 if {$::env(XILINX_BOARD) eq "genesys2"} {
   set hw_device [get_hw_devices xc7k325t_0]
diff --git a/target/xilinx/xilinx.mk b/target/xilinx/xilinx.mk
index 6fb8ed130..d59b889bd 100644
--- a/target/xilinx/xilinx.mk
+++ b/target/xilinx/xilinx.mk
@@ -10,7 +10,7 @@
 # Makefile variables (user inputs are in capital letters)
 #
 
-VIVADO   ?= vitis-2020.2 vivado
+VIVADO   ?= vitis-2022.1 vivado
 
 XILINX_PROJECT ?= carfield
 # XILINX_FLAVOR in {vanilla,bd} see carfield_bd.mk