diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d095ba2..8898873 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Configure
         shell: bash
-        run: cmake -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .
+        run: cmake -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" .
 
       - name: Build
         shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 342c032..ac072ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,19 @@ if (APPLE)
     # Target OS versions down to 10.11
     set (CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE INTERNAL "")
     
-    # Universal Binary
-    set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
+    # Uncomment to produce a universal binary
+    # set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
 endif()
 
 # Adds all the module sources so they appear correctly in the IDE
 set_property(GLOBAL PROPERTY USE_FOLDERS YES)
 option(JUCE_ENABLE_MODULE_SOURCE_GROUPS "Enable Module Source Groups" ON)
 
-add_subdirectory(modules/juce)
+option(PLUGINVAL_FETCH_JUCE "Fetch JUCE along with PluginVal" ON)
+
+if(PLUGINVAL_FETCH_JUCE)
+    add_subdirectory(modules/juce)
+endif()
 
 if (DEFINED ENV{VST2_SDK_DIR})
     MESSAGE(STATUS "Building with VST2 SDK: $ENV{VST2_SDK_DIR}")