diff --git a/Makefile b/Makefile
index 3e2789c851b538451454c1fbde265630536b10b5..521188380cd52ea0c8c88e075bd3d0ec35fe586f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,12 +30,16 @@ DEV_EXECUTABLES := $(shell cat script-inputs/dev-executables)
 
 ALL_EXECUTABLES := $(RELEASED_EXECUTABLES) $(EXPERIMENTAL_EXECUTABLES) $(DEV_EXECUTABLES)
 
-#Define octez only executables by excluding the EVM-node and teztale tools.
-OCTEZ_ONLY_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-node octez-teztale-archiver octez-teztale-server octez-teztale-snitch,${ALL_EXECUTABLES})
+#Define octez only executables.
+OCTEZ_ONLY_RELEASED_EXECUTABLES := $(shell cat script-inputs/octez-released-executables)
+OCTEZ_ONLY_EXPERIMENTAL_EXECUTABLES := $(shell cat script-inputs/octez-experimental-executables)
+OCTEZ_ONLY_EXECUTABLES := $(OCTEZ_ONLY_RELEASED_EXECUTABLES) $(OCTEZ_ONLY_EXPERIMENTAL_EXECUTABLES)
 
 #Define octez layer1 only executables by excluding the EVM-node and teztale tools.
 OCTEZ_ONLY_LAYER1_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-node octez-teztale-archiver octez-teztale-server octez-teztale-snitch octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dal-node,$(RELEASED_EXECUTABLES) $(EXPERIMENTAL_EXECUTABLES))
 
+TEZTALE_EXECUTABLES := $(shell cat script-inputs/experimental-executables)
+
 # Set of Dune targets to build, in addition to OCTEZ_EXECUTABLES, in
 # the `build` target's Dune invocation. This is used in the CI to
 # build the TPS evaluation tool, Octogram and the Tezt test suite in the
@@ -108,7 +112,7 @@ octez-layer1:
 
 .PHONY: teztale
 teztale:
-	@$(MAKE) build OCTEZ_EXECUTABLES?="octez-teztale-archiver octez-teztale-server octez-teztale-snitch"
+	@$(MAKE) build OCTEZ_EXECUTABLES?="${TEZTALE_EXECUTABLES}"
 
 .PHONY: experimental-release
 experimental-release: