diff --git a/Makefile b/Makefile
index 8a2150e44..eb89bf0d6 100644
--- a/Makefile
+++ b/Makefile
@@ -149,23 +149,11 @@ default: $(DEFAULT)
 # Load standard build rules
 include build/rules.mk
 
-.PHONY: workshop_python_emulator
-workshop_python_emulator:
-	make  PLATFORM=emscripten clean_for_apps_selection
-	make -j8 PLATFORM=emscripten EPSILON_APPS=code
-	make PLATFORM=emscripten clean_for_apps_selection
-
 .PHONY: clean
 clean:
 	@echo "CLEAN"
 	$(Q) rm -rf $(BUILD_DIR)
 
-.PHONY: clean_for_apps_selection
-clean_for_apps_selection:
-	@echo "CLEAN BEFORE CHANGING EPSILON_APPS"
-	$(Q) rm -f $(BUILD_DIR)/apps/apps_container_storage.o
-	$(Q) rm -f $(BUILD_DIR)/apps/i18n.*
-
 .PHONY: cowsay_%
 cowsay_%:
 	@echo " -------"
diff --git a/build/targets.simulator.mak b/build/targets.simulator.mak
index dab062a26..e7fae0855 100644
--- a/build/targets.simulator.mak
+++ b/build/targets.simulator.mak
@@ -1,2 +1,14 @@
 $(BUILD_DIR)/epsilon.packed.js: LDFLAGS += --memory-init-file 0
 $(BUILD_DIR)/epsilon.packed.js: $(call object_for,$(all_epsilon_default_src))
+
+.PHONY: workshop_python_emulator
+workshop_python_emulator:
+	make PLATFORM=simulator TARGET=web clean_for_apps_selection
+	make PLATFORM=simulator TARGET=web EPSILON_APPS=code
+	make PLATFORM=simulator TARGET=web clean_for_apps_selection
+
+.PHONY: clean_for_apps_selection
+clean_for_apps_selection:
+	@echo "CLEAN BEFORE CHANGING EPSILON_APPS"
+	$(Q) rm -f $(BUILD_DIR)/apps/apps_container_storage.o
+	$(Q) rm -f $(BUILD_DIR)/apps/i18n.*