diff --git a/kernel/cluster.c b/kernel/cluster.c
index c3b05e3..a642f18 100644
--- a/kernel/cluster.c
+++ b/kernel/cluster.c
@@ -17,9 +17,6 @@
 #include "pulp.h"
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef ARCHI_NO_FC
- #include "init.c"
-#endif
 
 volatile void *cluster_entry;
 
diff --git a/kernel/init.c b/kernel/init.c
index 28b1ef2..2c4d083 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -86,9 +86,9 @@ void pos_init_start()
   // Now now the minimal init are done, we can activate interruptions
   hal_irq_enable();
 
+  #ifdef ARCHI_NO_FC
   }
-
-  #ifndef ARCHI_NO_FC
+  #else
   if (!hal_is_fc())
   {
       cluster_start(hal_cluster_id(), main);
diff --git a/rules/pulpos/targets/pulp_cluster.mk b/rules/pulpos/targets/pulp_cluster.mk
new file mode 100644
index 0000000..41c30db
--- /dev/null
+++ b/rules/pulpos/targets/pulp_cluster.mk
@@ -0,0 +1,64 @@
+ifdef USE_IBEX
+PULP_LDFLAGS      += 
+PULP_CFLAGS       +=  -D__ibex__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 -DRV_ISA_RV32
+PULP_ARCH_CFLAGS ?=  -march=rv32imc
+PULP_ARCH_LDFLAGS ?=  -march=rv32imc
+PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imc
+else ifdef USE_CV32E40P
+PULP_LDFLAGS += 
+PULP_CFLAGS += -D__cv32e40p__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 
+PULP_ARCH_CFLAGS ?=  -march=rv32imcxgap9 -mnohwloop
+PULP_ARCH_LDFLAGS ?=  -march=rv32imcxgap9 -mnohwloop
+PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 -mnohwloop
+else
+PULP_LDFLAGS      += 
+PULP_CFLAGS       +=  -D__riscv__
+PULP_ARCH_CFLAGS ?=  -march=rv32imcxgap9
+PULP_ARCH_LDFLAGS ?=  -march=rv32imcxgap9
+PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9
+endif
+
+PULP_CFLAGS    += -fdata-sections -ffunction-sections -include chips/pulp_cluster/config.h -I$(PULPRT_HOME)/include/chips/pulp_cluster
+PULP_OMP_CFLAGS    += -fopenmp -mnativeomp
+PULP_LDFLAGS += -nostartfiles -nostdlib -Wl,--gc-sections -L$(PULPRT_HOME)/kernel -Tchips/pulp_cluster/link.ld -lgcc
+
+PULP_CC = riscv32-unknown-elf-gcc 
+PULP_AR ?= riscv32-unknown-elf-ar
+PULP_LD ?= riscv32-unknown-elf-gcc
+PULP_OBJDUMP ?= riscv32-unknown-elf-objdump
+
+fc/archi=riscv
+pe/archi=riscv
+pulp_chip=pulp_cluster
+pulp_chip_family=pulp_cluster
+cluster/version=5
+fc_itc/version=1
+udma/cpi/version=1
+udma/i2c/version=2
+soc/fll/version=1
+udma/i2s/version=2
+udma/uart/version=1
+event_unit/version=3
+perf_counters=True
+fll/version=1
+padframe/version=1
+udma/spim/version=3
+gpio/version=3
+udma/archi=3
+udma/version=3
+soc_eu/version=2
+
+
+# FLL
+PULP_SRCS     += kernel/fll-v$(fll/version).c
+PULP_SRCS     += kernel/freq-domains.c
+PULP_SRCS     += kernel/chips/pulp_cluster/soc.c
+
+
+include $(PULPRT_HOME)/rules/pulpos/configs/default.mk
+
+ifeq '$(platform)' 'fpga'
+CONFIG_IO_UART=1
+endif
+
+include $(PULPRT_HOME)/rules/pulpos/default_rules.mk