diff --git a/.github/workflows/fidelity-tests.yml b/.github/workflows/fidelity-tests.yml
index f37b04a245..46ee0a2ecb 100644
--- a/.github/workflows/fidelity-tests.yml
+++ b/.github/workflows/fidelity-tests.yml
@@ -5,10 +5,13 @@ on: pull_request
 jobs:
   compare_renders:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 90
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
+
     - uses: actions/setup-node@v3
       with:
         node-version: '16.x'
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..5b42e5ace7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/shared-assets/models/glTF-Sample-Assets"]
+	path = packages/shared-assets/models/glTF-Sample-Assets
+	url = git@github.com:KhronosGroup/glTF-Sample-Assets
diff --git a/packages/render-fidelity-tools/test/config.json b/packages/render-fidelity-tools/test/config.json
index 0b4af4576b..ef3c0272b7 100644
--- a/packages/render-fidelity-tools/test/config.json
+++ b/packages/render-fidelity-tools/test/config.json
@@ -42,7 +42,7 @@
   "scenarios": [
     {
       "name": "khronos-DragonAttenuation",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/DragonAttenuation/glTF/DragonAttenuation.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/DragonAttenuation/glTF/DragonAttenuation.gltf",
       "orbit": {
         "radius": 5
       },
@@ -52,7 +52,7 @@
     },
     {
       "name": "khronos-IridescentDishWithOlives",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/IridescentDishWithOlives/glTF-Binary/IridescentDishWithOlives.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/IridescentDishWithOlives/glTF-Binary/IridescentDishWithOlives.glb",
       "lighting": "../../../shared-assets/environments/spruit_sunrise_1k_HDR.hdr",
       "renderSkybox": true,
       "orbit": {
@@ -72,7 +72,7 @@
     },
     {
       "name": "khronos-ToyCar",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/ToyCar/glTF-Binary/ToyCar.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/ToyCar/glTF-Binary/ToyCar.glb",
       "orbit": {
         "radius": 0.037,
         "theta": -35,
@@ -88,7 +88,7 @@
     },
     {
       "name": "khronos-SheenChair",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SheenChair/glTF-Binary/SheenChair.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SheenChair/glTF-Binary/SheenChair.glb",
       "orbit": {
         "radius": 1.0
       },
@@ -104,7 +104,7 @@
     },
     {
       "name": "khronos-MaterialsVariantsShoe",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MaterialsVariantsShoe/glTF-Binary/MaterialsVariantsShoe.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MaterialsVariantsShoe/glTF-Binary/MaterialsVariantsShoe.glb",
       "orbit": {
         "radius": 0.275,
         "theta": 35,
@@ -123,28 +123,28 @@
     },
     {
       "name": "khronos-BoomBox",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoomBox/glTF/BoomBox.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoomBox/glTF/BoomBox.gltf",
       "orbit": {
         "radius": 0.03
       }
     },
     {
       "name": "khronos-FlightHelmet",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/FlightHelmet/glTF/FlightHelmet.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/FlightHelmet/glTF/FlightHelmet.gltf",
       "target": {
         "y": 0.32
       }
     },
     {
       "name": "khronos-SciFiHelmet",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SciFiHelmet/glTF/SciFiHelmet.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SciFiHelmet/glTF/SciFiHelmet.gltf",
       "orbit": {
         "radius": 4
       }
     },
     {
       "name": "khronos-DamagedHelmet",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/DamagedHelmet/glTF-Binary/DamagedHelmet.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/DamagedHelmet/glTF-Binary/DamagedHelmet.glb",
       "lighting": "../../../shared-assets/environments/aircraft_workshop_01_1k.hdr",
       "orbit": {
         "radius": 3
@@ -152,7 +152,7 @@
     },
     {
       "name": "khronos-ABeautifulGame",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/ABeautifulGame/glTF/ABeautifulGame.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/ABeautifulGame/glTF/ABeautifulGame.gltf",
       "renderSkybox": true,
       "orbit": {
         "radius": 1,
@@ -172,7 +172,7 @@
     },
     {
       "name": "khronos-IridescenceLamp",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/IridescenceLamp/glTF/IridescenceLamp.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/IridescenceLamp/glTF/IridescenceLamp.gltf",
       "renderSkybox": true,
       "orbit": {
         "radius": 0.85,
@@ -194,7 +194,7 @@
     },
     {
       "name": "khronos-LightsPunctualLamp",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/LightsPunctualLamp/glTF/LightsPunctualLamp.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/LightsPunctualLamp/glTF/LightsPunctualLamp.gltf",
       "renderSkybox": true,
       "orbit": {
         "radius": 2.75,
@@ -212,7 +212,7 @@
     },
     {
       "name": "khronos-MosquitoInAmber",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MosquitoInAmber/glTF/MosquitoInAmber.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MosquitoInAmber/glTF/MosquitoInAmber.gltf",
       "renderSkybox": true,
       "orbit": {
         "radius": 0.2,
@@ -229,7 +229,7 @@
     },
     {
       "name": "khronos-EmissiveStrengthTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/EmissiveStrengthTest/glTF/EmissiveStrengthTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/EmissiveStrengthTest/glTF/EmissiveStrengthTest.gltf",
       "orbit": {
         "radius": 12,
         "theta": 0,
@@ -242,7 +242,7 @@
     },
     {
       "name": "khronos-IridescenceDielectricSpheres",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/IridescenceDielectricSpheres/glTF/IridescenceDielectricSpheres.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/IridescenceDielectricSpheres/glTF/IridescenceDielectricSpheres.gltf",
       "orbit": {
         "radius": 50,
         "theta": 45,
@@ -262,7 +262,7 @@
     },
     {
       "name": "khronos-IridescenceMetallicSpheres",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/IridescenceMetallicSpheres/glTF/IridescenceMetallicSpheres.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/IridescenceMetallicSpheres/glTF/IridescenceMetallicSpheres.gltf",
       "orbit": {
         "radius": 50,
         "theta": 45,
@@ -282,7 +282,7 @@
     },
     {
       "name": "khronos-IridescenceSuzanne",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/IridescenceSuzanne/glTF/IridescenceSuzanne.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/IridescenceSuzanne/glTF/IridescenceSuzanne.gltf",
       "renderSkybox": true,
       "orbit": {
         "radius": 5
@@ -298,7 +298,7 @@
     },
     {
       "name": "khronos-AntiqueCamera",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AntiqueCamera/glTF/AntiqueCamera.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AntiqueCamera/glTF/AntiqueCamera.gltf",
       "dimensions": {
         "width": 512
       },
@@ -311,7 +311,7 @@
     },
     {
       "name": "khronos-Corset",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Corset/glTF/Corset.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Corset/glTF/Corset.gltf",
       "target": {
         "y": 0.03
       },
@@ -321,7 +321,7 @@
     },
     {
       "name": "khronos-Avocado",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Avocado/glTF/Avocado.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Avocado/glTF/Avocado.gltf",
       "target": {
         "y": 0.0314
       },
@@ -331,7 +331,7 @@
     },
     {
       "name": "khronos-BarramundiFish",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BarramundiFish/glTF-Binary/BarramundiFish.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BarramundiFish/glTF-Binary/BarramundiFish.glb",
       "dimensions": {
         "width": 1024,
         "height": 512
@@ -346,7 +346,7 @@
     },
     {
       "name": "khronos-Lantern",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Lantern/glTF/Lantern.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Lantern/glTF/Lantern.gltf",
       "dimensions": {
         "height": 1024
       },
@@ -360,7 +360,7 @@
     },
     {
       "name": "khronos-GlamVelvetSofa",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/GlamVelvetSofa/glTF/GlamVelvetSofa.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/GlamVelvetSofa/glTF/GlamVelvetSofa.gltf",
       "dimensions": {
         "height": 250
       },
@@ -378,7 +378,7 @@
     },
     {
       "name": "khronos-SheenCloth",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SheenCloth/glTF/SheenCloth.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SheenCloth/glTF/SheenCloth.gltf",
       "orbit": {
         "radius": 0.059
       },
@@ -391,14 +391,14 @@
     },
     {
       "name": "khronos-Suzanne",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Suzanne/glTF/Suzanne.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Suzanne/glTF/Suzanne.gltf",
       "orbit": {
         "radius": 3
       }
     },
     {
       "name": "khronos-SpecGlossVsMetalRough",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SpecGlossVsMetalRough/glTF-Binary/SpecGlossVsMetalRough.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SpecGlossVsMetalRough/glTF-Binary/SpecGlossVsMetalRough.glb",
       "orbit": {
         "radius": 0.5
       },
@@ -409,7 +409,7 @@
     },
     {
       "name": "khronos-Sponza",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf",
       "target": {
         "y": 1
       },
@@ -425,7 +425,7 @@
     },
     {
       "name": "khronos-CesiumMan",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/CesiumMan/glTF/CesiumMan.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/CesiumMan/glTF/CesiumMan.gltf",
       "target": {
         "y": 0.75
       },
@@ -435,7 +435,7 @@
     },
     {
       "name": "khronos-Cube",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Cube/glTF/Cube.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Cube/glTF/Cube.gltf",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -444,7 +444,7 @@
     },
     {
       "name": "khronos-Duck",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Duck/glTF/Duck.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Duck/glTF/Duck.gltf",
       "target": {
         "y": 0.86
       },
@@ -454,7 +454,7 @@
     },
     {
       "name": "khronos-MetalRoughSpheres",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
       "orbit": {
         "radius": 12
       },
@@ -462,7 +462,7 @@
     },
     {
       "name": "khronos-MetalRoughSpheres-HDR",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
       "lighting": "../../../shared-assets/environments/spruit_sunrise_1k_HDR.hdr",
       "orbit": {
         "radius": 12
@@ -471,7 +471,7 @@
     },
     {
       "name": "khronos-MetalRoughSpheres-LDR",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf",
       "lighting": "../../../shared-assets/environments/spruit_sunrise_1k_LDR.jpg",
       "orbit": {
         "radius": 12
@@ -486,7 +486,7 @@
     },
     {
       "name": "khronos-MetalRoughSpheresNoTextures",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MetalRoughSpheresNoTextures/glTF/MetalRoughSpheresNoTextures.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MetalRoughSpheresNoTextures/glTF/MetalRoughSpheresNoTextures.gltf",
       "orbit": {
         "radius": 0
       },
@@ -503,7 +503,7 @@
     },
     {
       "name": "khronos-EnvironmentTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/EnvironmentTest/glTF/EnvironmentTest.gltf",
       "dimensions": {
         "width": 1024
       },
@@ -529,7 +529,7 @@
     },
     {
       "name": "khronos-AlphaBlendModeTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AlphaBlendModeTest/glTF-Binary/AlphaBlendModeTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AlphaBlendModeTest/glTF-Binary/AlphaBlendModeTest.glb",
       "dimensions": {
         "width": 1024,
         "height": 512
@@ -546,7 +546,7 @@
     },
     {
       "name": "khronos-TransmissionTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TransmissionTest/glTF-Binary/TransmissionTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TransmissionTest/glTF-Binary/TransmissionTest.glb",
       "orbit": {
         "radius": 1.59
       },
@@ -564,7 +564,7 @@
     },
     {
       "name": "khronos-TransmissionRoughnessTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TransmissionRoughnessTest/glTF-Binary/TransmissionRoughnessTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TransmissionRoughnessTest/glTF-Binary/TransmissionRoughnessTest.glb",
       "orbit": {
         "radius": 1.1
       },
@@ -580,7 +580,7 @@
     },
     {
       "name": "khronos-AttenuationTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AttenuationTest/glTF/AttenuationTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AttenuationTest/glTF/AttenuationTest.gltf",
       "dimensions": {
         "width": 1024
       },
@@ -593,7 +593,7 @@
     },
     {
       "name": "khronos-SpecularTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SpecularTest/glTF-Binary/SpecularTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SpecularTest/glTF-Binary/SpecularTest.glb",
       "orbit": {
         "radius": 1.1
       },
@@ -610,14 +610,14 @@
     },
     {
       "name": "khronos-ClearCoatTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/ClearCoatTest/glTF/ClearCoatTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/ClearCoatTest/glTF/ClearCoatTest.gltf",
       "orbit": {
         "radius": 20
       }
     },
     {
       "name": "khronos-NormalTangentMirrorTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/NormalTangentMirrorTest/glTF/NormalTangentMirrorTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/NormalTangentMirrorTest/glTF/NormalTangentMirrorTest.gltf",
       "orbit": {
         "radius": 4.25
       },
@@ -628,7 +628,7 @@
     },
     {
       "name": "khronos-NormalTangentTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/NormalTangentTest/glTF/NormalTangentTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/NormalTangentTest/glTF/NormalTangentTest.gltf",
       "orbit": {
         "radius": 4.25
       },
@@ -639,7 +639,7 @@
     },
     {
       "name": "khronos-BoomBoxWithAxes",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoomBoxWithAxes/glTF/BoomBoxWithAxes.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoomBoxWithAxes/glTF/BoomBoxWithAxes.gltf",
       "target": {
         "y": 0.01
       },
@@ -650,23 +650,9 @@
         "stellar"
       ]
     },
-    {
-      "name": "khronos-2CylinderEngine",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/2CylinderEngine/glTF-Binary/2CylinderEngine.glb",
-      "lighting": "../../../shared-assets/environments/aircraft_workshop_01_1k.hdr",
-      "dimensions": {
-        "width": 1024
-      },
-      "orbit": {
-        "radius": 800
-      },
-      "exclude": [
-        "stellar"
-      ]
-    },
     {
       "name": "khronos-BrainStem",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BrainStem/glTF-Binary/BrainStem.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BrainStem/glTF-Binary/BrainStem.glb",
       "target": {
         "y": 0.9
       },
@@ -677,23 +663,9 @@
         "stellar"
       ]
     },
-    {
-      "name": "khronos-Buggy",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Buggy/glTF/Buggy.gltf",
-      "target": {
-        "x": 24,
-        "y": 50,
-        "z": 16
-      },
-      "orbit": {
-        "theta": -60,
-        "phi": 60,
-        "radius": 286
-      }
-    },
     {
       "name": "khronos-CesiumMilkTruck",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/CesiumMilkTruck/glTF/CesiumMilkTruck.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/CesiumMilkTruck/glTF/CesiumMilkTruck.gltf",
       "target": {
         "y": 1.3
       },
@@ -703,7 +675,7 @@
     },
     {
       "name": "khronos-Fox",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Fox/glTF/Fox.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Fox/glTF/Fox.gltf",
       "target": {
         "y": 37,
         "x": -35,
@@ -717,48 +689,9 @@
         "stellar"
       ]
     },
-    {
-      "name": "khronos-GearboxAssy",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/GearboxAssy/glTF/GearboxAssy.gltf",
-      "dimensions": {
-        "width": 1024,
-        "height": 512
-      },
-      "target": {
-        "x": 159,
-        "y": 17,
-        "z": 3.2
-      },
-      "orbit": {
-        "radius": 25
-      },
-      "exclude": [
-        "stellar"
-      ]
-    },
-    {
-      "name": "khronos-ReciprocatingSaw",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/ReciprocatingSaw/glTF-Binary/ReciprocatingSaw.glb",
-      "dimensions": {
-        "width": 1024,
-        "height": 512
-      },
-      "target": {
-        "x": -110,
-        "z": 44
-      },
-      "orbit": {
-        "theta": 30,
-        "phi": 60,
-        "radius": 300
-      },
-      "exclude": [
-        "stellar"
-      ]
-    },
     {
       "name": "khronos-TextureTransformMultiTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureTransformMultiTest/glTF-Binary/TextureTransformMultiTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureTransformMultiTest/glTF-Binary/TextureTransformMultiTest.glb",
       "orbit": {
         "radius": 2.9,
         "phi": 98
@@ -774,7 +707,7 @@
     },
     {
       "name": "khronos-TextureEncodingTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureEncodingTest/glTF-Binary/TextureEncodingTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureEncodingTest/glTF-Binary/TextureEncodingTest.glb",
       "orbit": {
         "radius": 13.0
       },
@@ -790,7 +723,7 @@
     },
     {
       "name": "khronos-RecursiveSkeletons",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/RecursiveSkeletons/glTF-Binary/RecursiveSkeletons.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/RecursiveSkeletons/glTF-Binary/RecursiveSkeletons.glb",
       "orbit": {
         "radius": 120.0,
         "phi": 5
@@ -807,7 +740,7 @@
     },
     {
       "name": "khronos-TextureLinearInterpolationTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureLinearInterpolationTest/glTF-Binary/TextureLinearInterpolationTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureLinearInterpolationTest/glTF-Binary/TextureLinearInterpolationTest.glb",
       "orbit": {
         "radius": 6.6
       },
@@ -820,7 +753,7 @@
     },
     {
       "name": "khronos-TwoSidedPlane",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TwoSidedPlane/glTF/TwoSidedPlane.gltf",
       "orbit": {
         "phi": 60,
         "radius": 3.5
@@ -831,7 +764,7 @@
     },
     {
       "name": "khronos-RiggedFigure",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/RiggedFigure/glTF/RiggedFigure.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/RiggedFigure/glTF/RiggedFigure.gltf",
       "target": {
         "y": 0.75
       },
@@ -844,7 +777,7 @@
     },
     {
       "name": "khronos-AnimatedCube",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AnimatedCube/glTF/AnimatedCube.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnimatedCube/glTF/AnimatedCube.gltf",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -856,7 +789,7 @@
     },
     {
       "name": "khronos-BoxAnimated",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoxAnimated/glTF-Binary/BoxAnimated.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoxAnimated/glTF-Binary/BoxAnimated.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -868,7 +801,7 @@
     },
     {
       "name": "khronos-InterpolationTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/InterpolationTest/glTF-Binary/InterpolationTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/InterpolationTest/glTF-Binary/InterpolationTest.glb",
       "target": {
         "y": 2.9
       },
@@ -881,7 +814,7 @@
     },
     {
       "name": "khronos-AnimatedMorphCube",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AnimatedMorphCube/glTF-Binary/AnimatedMorphCube.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnimatedMorphCube/glTF-Binary/AnimatedMorphCube.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -893,7 +826,7 @@
     },
     {
       "name": "khronos-OrientationTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/OrientationTest/glTF/OrientationTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/OrientationTest/glTF/OrientationTest.gltf",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -905,7 +838,7 @@
     },
     {
       "name": "khronos-AnimatedMorphSphere",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AnimatedMorphSphere/glTF-Binary/AnimatedMorphSphere.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnimatedMorphSphere/glTF-Binary/AnimatedMorphSphere.glb",
       "orbit": {
         "radius": 3
       },
@@ -915,7 +848,7 @@
     },
     {
       "name": "khronos-AnimatedTriangle",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/AnimatedTriangle/glTF/AnimatedTriangle.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnimatedTriangle/glTF/AnimatedTriangle.gltf",
       "target": {
         "x": 0.5,
         "y": 0.5
@@ -930,7 +863,7 @@
     },
     {
       "name": "khronos-Box",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Box/glTF-Binary/Box.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Box/glTF-Binary/Box.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -942,7 +875,7 @@
     },
     {
       "name": "khronos-BoxInterleaved",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoxInterleaved/glTF-Binary/BoxInterleaved.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoxInterleaved/glTF-Binary/BoxInterleaved.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -955,7 +888,7 @@
     },
     {
       "name": "khronos-BoxTextured",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoxTextured/glTF-Binary/BoxTextured.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoxTextured/glTF-Binary/BoxTextured.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -967,7 +900,7 @@
     },
     {
       "name": "khronos-BoxTexturedNonPowerOfTwo",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -979,7 +912,7 @@
     },
     {
       "name": "khronos-BoxVertexColors",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/BoxVertexColors/glTF/BoxVertexColors.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/BoxVertexColors/glTF/BoxVertexColors.gltf",
       "orbit": {
         "theta": 30,
         "phi": 60,
@@ -991,7 +924,7 @@
     },
     {
       "name": "khronos-SimpleSkin",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SimpleSkin/glTF/SimpleSkin.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SimpleSkin/glTF/SimpleSkin.gltf",
       "orbit": {
         "radius": 2.5
       },
@@ -1008,7 +941,7 @@
     },
     {
       "name": "khronos-MorphPrimitivesTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MorphPrimitivesTest/glTF-Binary/MorphPrimitivesTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MorphPrimitivesTest/glTF-Binary/MorphPrimitivesTest.glb",
       "dimensions": {
         "width": 1024,
         "height": 512
@@ -1023,7 +956,7 @@
     },
     {
       "name": "khronos-MorphStressTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MorphStressTest/glTF/MorphStressTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MorphStressTest/glTF/MorphStressTest.gltf",
       "dimensions": {
         "height": 300
       },
@@ -1036,7 +969,7 @@
     },
     {
       "name": "khronos-MultiUVTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/MultiUVTest/glTF/MultiUVTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/MultiUVTest/glTF/MultiUVTest.gltf",
       "orbit": {
         "radius": 4.25
       },
@@ -1047,7 +980,7 @@
     },
     {
       "name": "khronos-RiggedSimple",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/RiggedSimple/glTF/RiggedSimple.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/RiggedSimple/glTF/RiggedSimple.gltf",
       "dimensions": {
         "width": 512
       },
@@ -1061,7 +994,7 @@
     },
     {
       "name": "khronos-SimpleMeshes",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SimpleMeshes/glTF/SimpleMeshes.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SimpleMeshes/glTF/SimpleMeshes.gltf",
       "dimensions": {
         "height": 512
       },
@@ -1078,7 +1011,7 @@
     },
     {
       "name": "khronos-SimpleMorph",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SimpleMorph/glTF/SimpleMorph.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SimpleMorph/glTF/SimpleMorph.gltf",
       "target": {
         "x": 0.5,
         "y": 1.2
@@ -1093,7 +1026,7 @@
     },
     {
       "name": "khronos-SimpleSparseAccessor",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/SimpleSparseAccessor/glTF/SimpleSparseAccessor.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/SimpleSparseAccessor/glTF/SimpleSparseAccessor.gltf",
       "target": {
         "x": 3,
         "y": 2
@@ -1108,7 +1041,7 @@
     },
     {
       "name": "khronos-TextureCoordinateTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureCoordinateTest/glTF-Binary/TextureCoordinateTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureCoordinateTest/glTF-Binary/TextureCoordinateTest.glb",
       "orbit": {
         "radius": 4
       },
@@ -1118,7 +1051,7 @@
     },
     {
       "name": "khronos-TextureSettingsTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureSettingsTest/glTF-Binary/TextureSettingsTest.glb",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureSettingsTest/glTF-Binary/TextureSettingsTest.glb",
       "orbit": {
         "radius": 15
       },
@@ -1128,7 +1061,7 @@
     },
     {
       "name": "khronos-TextureTransformTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TextureTransformTest/glTF/TextureTransformTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureTransformTest/glTF/TextureTransformTest.gltf",
       "orbit": {
         "radius": 4
       },
@@ -1138,7 +1071,7 @@
     },
     {
       "name": "khronos-Triangle",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/Triangle/glTF/Triangle.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Triangle/glTF/Triangle.gltf",
       "target": {
         "x": 0.5,
         "y": 0.5
@@ -1153,7 +1086,7 @@
     },
     {
       "name": "khronos-TriangleWithoutIndices",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf",
       "target": {
         "x": 0.5,
         "y": 0.5
@@ -1168,7 +1101,7 @@
     },
     {
       "name": "khronos-UnlitTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/UnlitTest/glTF/UnlitTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/UnlitTest/glTF/UnlitTest.gltf",
       "orbit": {
         "radius": 7
       },
@@ -1180,7 +1113,7 @@
     },
     {
       "name": "khronos-VertexColorTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/VertexColorTest/glTF/VertexColorTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/VertexColorTest/glTF/VertexColorTest.gltf",
       "orbit": {
         "radius": 4
       },
@@ -1205,7 +1138,7 @@
     },
     {
       "name": "DirectionalLightTest",
-      "model": "../../../shared-assets/models/glTF-Sample-Models/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf",
+      "model": "../../../shared-assets/models/glTF-Sample-Assets/Models/EnvironmentTest/glTF/EnvironmentTest.gltf",
       "lighting": "../../../shared-assets/environments/spot1Lux.hdr",
       "dimensions": {
         "width": 1024
diff --git a/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/filament-golden.png b/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/filament-golden.png
index 269088bf5a..21c03ca655 100644
Binary files a/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/filament-golden.png and b/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/filament-golden.png differ
diff --git a/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/model-viewer-golden.png b/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/model-viewer-golden.png
index 695064b7e5..28e34e7471 100644
Binary files a/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/model-viewer-golden.png and b/packages/render-fidelity-tools/test/goldens/khronos-TextureTransformMultiTest/model-viewer-golden.png differ
diff --git a/packages/shared-assets/models/glTF-Sample-Assets b/packages/shared-assets/models/glTF-Sample-Assets
new file mode 160000
index 0000000000..3a1531e3f3
--- /dev/null
+++ b/packages/shared-assets/models/glTF-Sample-Assets
@@ -0,0 +1 @@
+Subproject commit 3a1531e3f39ab20812ee05de6be1c5342983ac35
diff --git a/packages/shared-assets/scripts/fetch-khronos-gltf-samples.sh b/packages/shared-assets/scripts/fetch-khronos-gltf-samples.sh
index d0834b0a8c..7664db0057 100755
--- a/packages/shared-assets/scripts/fetch-khronos-gltf-samples.sh
+++ b/packages/shared-assets/scripts/fetch-khronos-gltf-samples.sh
@@ -18,31 +18,9 @@
 # This script is responsible for cloning and / or updating the local repository
 # of Khronos glTF sample models
 
-REPO_URL=https://github.com/KhronosGroup/glTF-Sample-Models.git
-CLONE_PATH=$(dirname $0)/../models/glTF-Sample-Models
-
-if [ ! -d "$CLONE_PATH/.git" ]; then
-  git clone --depth=1 $REPO_URL $CLONE_PATH
-fi
-
-pushd $CLONE_PATH
-ORIGIN_URL=`git config remote.origin.url`;
-
 echo '🐶 Fetching Khronos glTF sample models.
 🐕 WARNING: This might result in hundreds of megabytes of data usage!'
 
-if [ -z "$ORIGIN_URL" ]; then
-  git remote add origin $REPO_URL
-else
-  if [ ! "$REPO_URL" == "$ORIGIN_URL" ]; then
-    git remote rm origin
-    git remote add origin $REPO_URL
-  fi
-fi
-
-git fetch origin
-git reset --hard origin/master
+git submodule update --init --recursive
 
 echo '🎾 Sample models are now available'
-
-popd