diff --git a/Makefile b/Makefile
index 4b642f2e..8522720f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ BENDER_VERSION = 0.27.1
 OPCODES := "opcodes-rvv opcodes-rv32b_CUSTOM opcodes-ipu_CUSTOM opcodes-frep_CUSTOM opcodes-dma_CUSTOM opcodes-ssr_CUSTOM opcodes-smallfloat"
 
 # Default target
-all: bender toolchain update_opcodes
+init: bender update_opcodes
+
+all: init toolchain
 
 ###############
 #  Toolchain  #
@@ -24,8 +26,6 @@ all: bender toolchain update_opcodes
 
 toolchain: download tc-llvm tc-riscv-gcc tc-riscv-isa-sim verilator
 
-init: bender update_opcodes
-
 .PHONY: download 
 download: sw/toolchain/riscv-gnu-toolchain sw/toolchain/llvm-project sw/toolchain/riscv-opcodes sw/toolchain/verilator sw/toolchain/riscv-isa-sim sw/toolchain/dtc