diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index dd10f56d..7abd0974 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -95,10 +95,10 @@ set -e
 
 # Generate extra parts file (tilegrid, tileconn, part yaml, part json and package_pin)
 # TODO: Disabled for now as for big parts it takes a huge amount of time
-#set +e
-#make db-extras-${XRAY_SETTINGS}-parts -j $CORES
-EXTRAS_PARTS_RET=0
-#set -e
+set +e
+make db-extras-${XRAY_SETTINGS}-parts -j $CORES
+EXTRAS_PARTS_RET=$?
+set -e
 
 # Format the database
 make db-format-${XRAY_SETTINGS}
diff --git a/Makefile b/Makefile
index 41c2af53..0715285e 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ $(foreach DB,$(DATABASES),$(eval $(call database,$(DB))))
 # Targets related to Project X-Ray parts
 # --------------------------------------
 
-ARTIX_PARTS=artix200t
+ARTIX_PARTS=
 ZYNQ_PARTS=zynq7010
 KINTEX_PARTS=kintex70t
 
@@ -187,7 +187,7 @@ db-extras-kintex7-parts:
 db-extras-kintex7-harness:
 	@true
 
-db-extras-zynq7-parts: $(addprefix db-part-only-,$(ARTIX_PARTS))
+db-extras-zynq7-parts: $(addprefix db-part-only-,$(ZYNQ_PARTS))
 
 db-extras-zynq7-harness:
 	@true