diff --git a/Dockerfile b/Dockerfile
index fd01e480..4f9592d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.20
+FROM docker.io/emscripten/emsdk:2.0.34
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
diff --git a/Makefile b/Makefile
index 281b984b..97df4708 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@
 BASE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 DIST_DIR:=$(BASE_DIR)dist/libraries
 
-GLOBAL_CFLAGS:=-O3 -s ENVIRONMENT=web,webview
+GLOBAL_CFLAGS:=-O3
+GLOBAL_LDFLAGS:=-O3 -s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
+export LDFLAGS = $(GLOBAL_LDFLAGS)
 
 all: subtitleoctopus
 
@@ -24,10 +26,7 @@ $(DIST_DIR)/lib/libfribidi.a: build/lib/fribidi/configure
 		CFLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_FILESYSTEM=1 \
-		-s NO_EXIT_RUNTIME=1 \
 		-DFRIBIDI_ENTRY=extern \
-		-s MODULARIZE=1 \
 		" \
 		--prefix="$(DIST_DIR)" \
 		--host=x86-none-linux \
@@ -50,9 +49,6 @@ $(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
 		-DCMAKE_C_FLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_FILESYSTEM=1 \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
 		-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
 		-DEXPAT_BUILD_DOCS=off \
@@ -112,9 +108,6 @@ build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotli
 			CFLAGS=" \
 			-s USE_PTHREADS=0 \
 			$(GLOBAL_CFLAGS) \
-			-s NO_FILESYSTEM=1 \
-			-s NO_EXIT_RUNTIME=1 \
-			-s MODULARIZE=1 \
 			" \
 			--prefix="$$(pwd)/dist_hb" \
 			--host=x86-none-linux \
@@ -145,20 +138,13 @@ $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreety
 		CFLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_FILESYSTEM=1 \
 		-DHB_NO_MT \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
 		CXXFLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_FILESYSTEM=1 \
 		-DHB_NO_MT \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
-		LDFLAGS="" \
 		--prefix="$(DIST_DIR)" \
 		--host=x86-none-linux \
 		--build=x86_64 \
@@ -183,9 +169,6 @@ $(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/lib
 		CFLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_FILESYSTEM=1 \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
 		--prefix="$(DIST_DIR)" \
 		--host=x86-none-linux \
@@ -217,8 +200,6 @@ $(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/l
 		-s USE_PTHREADS=0 \
 		-DEMSCRIPTEN \
 		$(GLOBAL_CFLAGS) \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
 		--prefix="$(DIST_DIR)" \
 		--host=x86-none-linux \
@@ -247,8 +228,6 @@ $(DIST_DIR)/lib/libass.a: $(DIST_DIR)/lib/libfontconfig.a $(DIST_DIR)/lib/libhar
 		CFLAGS=" \
 		-s USE_PTHREADS=0 \
 		$(GLOBAL_CFLAGS) \
-		-s NO_EXIT_RUNTIME=1 \
-		-s MODULARIZE=1 \
 		" \
 		--prefix="$(DIST_DIR)" \
 		--host=x86-none-linux \
@@ -292,10 +271,9 @@ src/subtitles-octopus-worker.bc: $(OCTP_DEPS) src/Makefile src/SubtitleOctopus.c
 
 # Dist Files
 EMCC_COMMON_ARGS = \
-	$(GLOBAL_CFLAGS) \
+	$(GLOBAL_LDFLAGS) \
 	-s EXPORTED_FUNCTIONS="['_main', '_malloc']" \
 	-s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'getValue', 'FS_createPreloadedFile', 'FS_createPath']" \
-	-s NO_EXIT_RUNTIME=1 \
 	--use-preload-plugins \
 	--preload-file assets/default.woff2 \
 	--preload-file assets/fonts.conf \