diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index bd25471..a8b0756 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -29,7 +29,6 @@ jobs:
       - name: Build AdditiveFOAM
         run: |
           . /opt/openfoam10/etc/bashrc
-          cd applications/solvers/additiveFoam
           ./Allwmake
       - name: Test AdditiveFOAM
         run: |
diff --git a/Allwmake b/Allwmake
new file mode 100755
index 0000000..037fad3
--- /dev/null
+++ b/Allwmake
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+# Compile AdditiveFOAM libraries and applications
+applications/Allwmake $targetType $*
+
+#------------------------------------------------------------------------------
diff --git a/applications/Allwmake b/applications/Allwmake
new file mode 100755
index 0000000..fa65060
--- /dev/null
+++ b/applications/Allwmake
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake -all $targetType solvers
+wmake -all $targetType utilities
+
+#------------------------------------------------------------------------------