diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index 7abd0974..6d6c63f1 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -94,7 +94,6 @@ EXTRAS_HARNESS_RET=$?
 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=$?
diff --git a/Makefile b/Makefile
index aaa05a0c..0bc81806 100644
--- a/Makefile
+++ b/Makefile
@@ -160,8 +160,6 @@ endef
 $(foreach PART,$(XRAY_PARTS),$(eval $(call multiple-parts,$(PART))))
 
 db-extras-artix7-parts: $(addprefix db-part-only-,$(ARTIX_PARTS))
-	+XRAY_PIN_00=J13 XRAY_PIN_01=J14 XRAY_PIN_02=K15 XRAY_PIN_03=K16 \
-		XRAY_PART=xc7a35tftg256-1 XRAY_EQUIV_PART=xc7a50tfgg484-1 $(MAKE) -C fuzzers roi_only
 
 db-extras-artix7-harness:
 	+source minitests/roi_harness/basys3-swbut.sh && $(MAKE) -C fuzzers roi_only
@@ -182,6 +180,8 @@ db-extras-artix7-harness:
 	+source minitests/roi_harness/arty-swbut.sh && \
 		$(MAKE) -C minitests/roi_harness \
 			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut run copy
+	+XRAY_PIN_00=J13 XRAY_PIN_01=J14 XRAY_PIN_02=K15 XRAY_PIN_03=K16 \
+		XRAY_PART=xc7a35tftg256-1 XRAY_EQUIV_PART=xc7a50tfgg484-1 $(MAKE) -C fuzzers roi_only
 
 db-extras-kintex7-parts:
 	@true