diff --git a/sw/deps/cva6-sdk b/sw/deps/cva6-sdk
index 3b08b0ea..596dd4d1 160000
--- a/sw/deps/cva6-sdk
+++ b/sw/deps/cva6-sdk
@@ -1 +1 @@
-Subproject commit 3b08b0ea40a259c13443c50e506e6998e73ae1f5
+Subproject commit 596dd4d165b214fb98e4cdda857e4fd58e67294f
diff --git a/target/xilinx/xilinx/common.mk b/target/xilinx/xilinx/common.mk
index 2b847c07..c71ed033 100644
--- a/target/xilinx/xilinx/common.mk
+++ b/target/xilinx/xilinx/common.mk
@@ -31,7 +31,8 @@ $(PROJECT).xpr:
 
 # Generate a sha based on env variables and artifacts_in
 generate_sha256:
-	@echo $(VIVADOENV) $(VIVADO) $(PROJECT) $(ARTIFACTS_IN) > .generated_env
+	@echo $(VIVADO) $(PROJECT) > .generated_env
+	@echo $(VIVADOENV) | tr " " "\n" | grep $(foreach var,$(ARTIFACTS_VARS), $(addprefix -e ,$(var)))  >> .generated_env
 	@sha256sum $(ARTIFACTS_IN) >> .generated_env
 	@sha256sum .generated_env | awk '{print $$1}' > .generated_sha256
 
@@ -46,6 +47,7 @@ load-artifacts: .generated_sha256
 save-artifacts: generate_sha256 load-artifacts $(PROJECT).xpr
 	@if [ ! -d "$(ARTIFACTS_PATH)/`cat .generated_sha256`" ]; then \
 		cp -r . $(ARTIFACTS_PATH)/`cat .generated_sha256`; \
+		chmod -R o+rw $(ARTIFACTS_PATH)/`cat .generated_sha256`; \
 	fi
 
 gui:
diff --git a/target/xilinx/xilinx/xlnx_clk_wiz/Makefile b/target/xilinx/xilinx/xlnx_clk_wiz/Makefile
index 70060cea..38bd62d7 100644
--- a/target/xilinx/xilinx/xlnx_clk_wiz/Makefile
+++ b/target/xilinx/xilinx/xlnx_clk_wiz/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_clk_wiz
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
-include ../common.mk
\ No newline at end of file
+include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile b/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile
index 07161ff5..4de35579 100644
--- a/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile
+++ b/target/xilinx/xilinx/xlnx_mig_7_ddr3/Makefile
@@ -4,5 +4,6 @@
 
 PROJECT:=xlnx_mig_7_ddr3
 ARTIFACTS_IN:=Makefile tcl/run.tcl mig_genesys2.prj mig_kc705.prj mig_vc707.prj
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
-include ../common.mk
\ No newline at end of file
+include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile b/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile
index 5bd52cca..aaec632d 100644
--- a/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile
+++ b/target/xilinx/xilinx/xlnx_mig_ddr4/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_mig_ddr4
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
 include ../common.mk
diff --git a/target/xilinx/xilinx/xlnx_vio/Makefile b/target/xilinx/xilinx/xlnx_vio/Makefile
index 17949698..d400c7b8 100644
--- a/target/xilinx/xilinx/xlnx_vio/Makefile
+++ b/target/xilinx/xilinx/xlnx_vio/Makefile
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 PROJECT:=xlnx_vio
+# The files and variables on which the IP configuration depends
 ARTIFACTS_IN:=Makefile tcl/run.tcl
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
 
 include ../common.mk