diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 8a379e4eec..0800b6a1cd 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -44,8 +44,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
-        
+
+    - uses: actions/setup-java@v2
+      with:
+        distribution: 'microsoft' # See 'Supported distributions' for available options
+        java-version: '11'
+
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
diff --git a/.github/workflows/genbindings-ci.yml b/.github/workflows/genbindings-ci.yml
index c009c750f0..fd776424a9 100644
--- a/.github/workflows/genbindings-ci.yml
+++ b/.github/workflows/genbindings-ci.yml
@@ -18,12 +18,11 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
 
     - name: Setup Python
       uses: actions/setup-python@v2
 
-    - uses: ilammy/msvc-dev-cmd@v1.9.0
+    - uses: ilammy/msvc-dev-cmd@v1.10.0
       with: 
         arch: ${{ env.BUILD_ARCH }}
 
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index 09774f86ce..43a4412b95 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -33,7 +33,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
         
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 75539816a5..2936898ec1 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -34,7 +34,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
diff --git a/.github/workflows/osx-ci.yml b/.github/workflows/osx-ci.yml
index ca230cd4ef..bbcecd7d97 100644
--- a/.github/workflows/osx-ci.yml
+++ b/.github/workflows/osx-ci.yml
@@ -33,7 +33,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
         
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index 23cc0f8019..7d5afccc90 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -25,7 +25,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          lfs: 'true'
       - name: Setup Python
         uses: actions/setup-python@v2
       - name: Build
@@ -41,7 +40,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          lfs: 'true'
       - name: Build
         run: |
           tools/unix-ci/before-install.sh
@@ -64,7 +62,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          lfs: 'true'
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'microsoft' # See 'Supported distributions' for available options
+          java-version: '11'
       - name: Build
         run: |
           tools/unix-ci/before-install.sh
@@ -80,7 +81,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          lfs: 'true'
       - name: Build
         run: |
           tools/unix-ci/before-install.sh
@@ -96,7 +96,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          lfs: 'true'
       - name: Build
         run: |
           tools/unix-ci/before-install.sh
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 0c4f6b8e44..013d8e354b 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -34,12 +34,11 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-        lfs: 'true'
 
     - name: Setup Python
       uses: actions/setup-python@v2
 
-    - uses: ilammy/msvc-dev-cmd@v1.9.0
+    - uses: ilammy/msvc-dev-cmd@v1.10.0
       with: 
         arch: ${{ env.BUILD_ARCH }}