diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 01002e407..d839b0ea7 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-simulator-web.zip
-          path: output/release/simulator/web/simulator.zip
+          path: output/release/simulator/web/epsilon.zip
       - run: make -j2 PLATFORM=simulator TARGET=web test.headless.js
       - run: node output/release/simulator/web/test.headless.js
   build-simulator-linux:
diff --git a/build/targets.all.mak b/build/targets.all.mak
index 1a48a316e..45d86d275 100644
--- a/build/targets.all.mak
+++ b/build/targets.all.mak
@@ -41,8 +41,8 @@ all_official:
 	$(Q) cp output/release/device/n0100/epsilon.official.onboarding.dfu output/all_official/epsilon.device.n0100.dfu
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR WEB ZIP"
 	$(Q) $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web clean
-	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/simulator.official.zip
-	$(Q) cp output/release/simulator/web/simulator.official.zip output/all_official/simulator.web.zip
+	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/epsilon.official.zip
+	$(Q) cp output/release/simulator/web/epsilon.official.zip output/all_official/simulator.web.zip
 	$(Q) echo "BUILD_FIRMWARE    SIMULATOR WEB JS"
 	$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web epsilon.official.js
 	$(Q) cp output/release/simulator/web/epsilon.official.js output/all_official/epsilon.js
diff --git a/build/targets.simulator.web.mak b/build/targets.simulator.web.mak
index a1774a34a..c5c96149f 100644
--- a/build/targets.simulator.web.mak
+++ b/build/targets.simulator.web.mak
@@ -1,3 +1,5 @@
+HANDY_TARGETS_EXTENSIONS += zip
+
 $(BUILD_DIR)/epsilon%packed.js: EMSCRIPTEN_INIT_FILE = 0
 
 $(BUILD_DIR)/test.headless.js: EMSCRIPTEN_MODULARIZE = 0
diff --git a/ion/src/simulator/web/Makefile b/ion/src/simulator/web/Makefile
index 4ae2c8882..28d4c0c95 100644
--- a/ion/src/simulator/web/Makefile
+++ b/ion/src/simulator/web/Makefile
@@ -24,9 +24,9 @@ ion_src += ion/src/simulator/shared/dummy/telemetry_init.cpp
 ion_src += ion/src/shared/telemetry_console.cpp
 endif
 
-DEFAULT = $(BUILD_DIR)/simulator.zip
+DEFAULT = epsilon.zip
 
-$(BUILD_DIR)/simulator%zip: $(BUILD_DIR)/epsilon%packed.js $(BUILD_DIR)/ion/src/simulator/web/simulator.html
+$(BUILD_DIR)/epsilon%zip: $(BUILD_DIR)/epsilon%packed.js $(BUILD_DIR)/ion/src/simulator/web/simulator.html
 	@rm -rf $(basename $@)
 	@mkdir -p $(basename $@)
 	@cp $< $(basename $@)/epsilon.js