diff --git a/support/src/Makefile b/support/src/Makefile
index 923279d5..dc95c529 100644
--- a/support/src/Makefile
+++ b/support/src/Makefile
@@ -1,6 +1,6 @@
-FontWriter: always
+.PHONY: FontWriter
+
+FontWriter:
 	$(MAKE) -C $(JABY_ENGINE_DIR)/support/src/FontWriter $(MAKECMDGOALS)
 
-all: FontWriter
-
-always: ;
\ No newline at end of file
+all: FontWriter
\ No newline at end of file
diff --git a/support/src/SupportLibrary.code-workspace b/support/src/SupportLibrary.code-workspace
index 20041bb3..1c8ddf84 100644
--- a/support/src/SupportLibrary.code-workspace
+++ b/support/src/SupportLibrary.code-workspace
@@ -19,11 +19,7 @@
             {
                 "label": "make",
                 "type": "shell",
-                "command": "../../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter make ${input:target} BUILD_PROFILE=${input:build cfg}",
-                "options": {
-                    // TODO: This should not be the case
-                    "cwd": "${workspaceFolder}/FontWriter"
-                },
+                "command": "../../scripts/podman_jaby_engine.sh ${workspaceFolder}/..:src/FontWriter make ${input:target} BUILD_PROFILE=${input:build cfg}",
                 "group": "build"
             }
         ],