diff --git a/assets/shaders/array_texture.wgsl b/assets/shaders/array_texture.wgsl
index 161efadb18d24..f67e08aa06471 100644
--- a/assets/shaders/array_texture.wgsl
+++ b/assets/shaders/array_texture.wgsl
@@ -6,8 +6,8 @@
 }
 #import bevy_core_pipeline::tonemapping::tone_mapping
 
-@group(1) @binding(0) var my_array_texture: texture_2d_array<f32>;
-@group(1) @binding(1) var my_array_texture_sampler: sampler;
+@group(2) @binding(0) var my_array_texture: texture_2d_array<f32>;
+@group(2) @binding(1) var my_array_texture_sampler: sampler;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/circle_shader.wgsl b/assets/shaders/circle_shader.wgsl
index 94f7445e08409..7e3f676626b3c 100644
--- a/assets/shaders/circle_shader.wgsl
+++ b/assets/shaders/circle_shader.wgsl
@@ -12,10 +12,9 @@ var<uniform> input: CustomUiMaterial;
 fn fragment(in: UiVertexOutput) -> @location(0) vec4<f32> {
     // the UVs are now adjusted around the middle of the rect.
     let uv = in.uv * 2.0 - 1.0;
-    
+
     // circle alpha, the higher the power the harsher the falloff.
     let alpha = 1.0 - pow(sqrt(dot(uv, uv)), 100.0);
 
     return vec4<f32>(input.color.rgb, alpha);
 }
-
diff --git a/assets/shaders/cubemap_unlit.wgsl b/assets/shaders/cubemap_unlit.wgsl
index 425eb2f5f2476..14e45a045bfdb 100644
--- a/assets/shaders/cubemap_unlit.wgsl
+++ b/assets/shaders/cubemap_unlit.wgsl
@@ -1,12 +1,12 @@
 #import bevy_pbr::forward_io::VertexOutput
 
 #ifdef CUBEMAP_ARRAY
-@group(1) @binding(0) var base_color_texture: texture_cube_array<f32>;
+@group(2) @binding(0) var base_color_texture: texture_cube_array<f32>;
 #else
-@group(1) @binding(0) var base_color_texture: texture_cube<f32>;
+@group(2) @binding(0) var base_color_texture: texture_cube<f32>;
 #endif
 
-@group(1) @binding(1) var base_color_sampler: sampler;
+@group(2) @binding(1) var base_color_sampler: sampler;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/custom_material.frag b/assets/shaders/custom_material.frag
index 004bdf787ae4a..a6bc9af0d2a7d 100644
--- a/assets/shaders/custom_material.frag
+++ b/assets/shaders/custom_material.frag
@@ -3,10 +3,10 @@ layout(location = 0) in vec2 v_Uv;
 
 layout(location = 0) out vec4 o_Target;
 
-layout(set = 1, binding = 0) uniform vec4 CustomMaterial_color;
+layout(set = 2, binding = 0) uniform vec4 CustomMaterial_color;
 
-layout(set = 1, binding = 1) uniform texture2D CustomMaterial_texture;
-layout(set = 1, binding = 2) uniform sampler CustomMaterial_sampler;
+layout(set = 2, binding = 1) uniform texture2D CustomMaterial_texture;
+layout(set = 2, binding = 2) uniform sampler CustomMaterial_sampler;
 
 // wgsl modules can be imported and used in glsl
 // FIXME - this doesn't work any more ...
diff --git a/assets/shaders/custom_material.vert b/assets/shaders/custom_material.vert
index b9d6cafc1f378..91d660ec3194c 100644
--- a/assets/shaders/custom_material.vert
+++ b/assets/shaders/custom_material.vert
@@ -23,9 +23,9 @@ struct Mesh {
 };
 
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-layout(set = 2, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
+layout(set = 1, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
 #else
-layout(set = 2, binding = 0) readonly buffer _Meshes {
+layout(set = 1, binding = 0) readonly buffer _Meshes {
     Mesh Meshes[];
 };
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE
diff --git a/assets/shaders/custom_material.wgsl b/assets/shaders/custom_material.wgsl
index 88d904dd1b87c..1b65627d45b32 100644
--- a/assets/shaders/custom_material.wgsl
+++ b/assets/shaders/custom_material.wgsl
@@ -2,9 +2,9 @@
 // we can import items from shader modules in the assets folder with a quoted path
 #import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER
 
-@group(1) @binding(0) var<uniform> material_color: vec4<f32>;
-@group(1) @binding(1) var material_color_texture: texture_2d<f32>;
-@group(1) @binding(2) var material_color_sampler: sampler;
+@group(2) @binding(0) var<uniform> material_color: vec4<f32>;
+@group(2) @binding(1) var material_color_texture: texture_2d<f32>;
+@group(2) @binding(2) var material_color_sampler: sampler;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/custom_material_screenspace_texture.wgsl b/assets/shaders/custom_material_screenspace_texture.wgsl
index a4afd6422530b..36da2a7f8c204 100644
--- a/assets/shaders/custom_material_screenspace_texture.wgsl
+++ b/assets/shaders/custom_material_screenspace_texture.wgsl
@@ -4,8 +4,8 @@
     utils::coords_to_viewport_uv,
 }
 
-@group(1) @binding(0) var texture: texture_2d<f32>;
-@group(1) @binding(1) var texture_sampler: sampler;
+@group(2) @binding(0) var texture: texture_2d<f32>;
+@group(2) @binding(1) var texture_sampler: sampler;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/custom_vertex_attribute.wgsl b/assets/shaders/custom_vertex_attribute.wgsl
index d17246f89abf0..89cefd80f1e49 100644
--- a/assets/shaders/custom_vertex_attribute.wgsl
+++ b/assets/shaders/custom_vertex_attribute.wgsl
@@ -3,7 +3,7 @@
 struct CustomMaterial {
     color: vec4<f32>,
 };
-@group(1) @binding(0) var<uniform> material: CustomMaterial;
+@group(2) @binding(0) var<uniform> material: CustomMaterial;
 
 struct Vertex {
     @builtin(instance_index) instance_index: u32,
diff --git a/assets/shaders/extended_material.wgsl b/assets/shaders/extended_material.wgsl
index c6fd8aea9dd79..fc69f30bb56e4 100644
--- a/assets/shaders/extended_material.wgsl
+++ b/assets/shaders/extended_material.wgsl
@@ -19,7 +19,7 @@ struct MyExtendedMaterial {
     quantize_steps: u32,
 }
 
-@group(1) @binding(100)
+@group(2) @binding(100)
 var<uniform> my_extended_material: MyExtendedMaterial;
 
 @fragment
diff --git a/assets/shaders/fallback_image_test.wgsl b/assets/shaders/fallback_image_test.wgsl
index 59124786580ab..c48f091bcca4c 100644
--- a/assets/shaders/fallback_image_test.wgsl
+++ b/assets/shaders/fallback_image_test.wgsl
@@ -1,22 +1,22 @@
 #import bevy_pbr::forward_io::VertexOutput
 
-@group(1) @binding(0) var test_texture_1d: texture_1d<f32>;
-@group(1) @binding(1) var test_texture_1d_sampler: sampler;
+@group(2) @binding(0) var test_texture_1d: texture_1d<f32>;
+@group(2) @binding(1) var test_texture_1d_sampler: sampler;
 
-@group(1) @binding(2) var test_texture_2d: texture_2d<f32>;
-@group(1) @binding(3) var test_texture_2d_sampler: sampler;
+@group(2) @binding(2) var test_texture_2d: texture_2d<f32>;
+@group(2) @binding(3) var test_texture_2d_sampler: sampler;
 
-@group(1) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
-@group(1) @binding(5) var test_texture_2d_array_sampler: sampler;
+@group(2) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
+@group(2) @binding(5) var test_texture_2d_array_sampler: sampler;
 
-@group(1) @binding(6) var test_texture_cube: texture_cube<f32>;
-@group(1) @binding(7) var test_texture_cube_sampler: sampler;
+@group(2) @binding(6) var test_texture_cube: texture_cube<f32>;
+@group(2) @binding(7) var test_texture_cube_sampler: sampler;
 
-@group(1) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
-@group(1) @binding(9) var test_texture_cube_array_sampler: sampler;
+@group(2) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
+@group(2) @binding(9) var test_texture_cube_array_sampler: sampler;
 
-@group(1) @binding(10) var test_texture_3d: texture_3d<f32>;
-@group(1) @binding(11) var test_texture_3d_sampler: sampler;
+@group(2) @binding(10) var test_texture_3d: texture_3d<f32>;
+@group(2) @binding(11) var test_texture_3d_sampler: sampler;
 
 @fragment
 fn fragment(in: VertexOutput) {}
diff --git a/assets/shaders/line_material.wgsl b/assets/shaders/line_material.wgsl
index e2ae15c1312c0..cc7ca047d5d2d 100644
--- a/assets/shaders/line_material.wgsl
+++ b/assets/shaders/line_material.wgsl
@@ -4,7 +4,7 @@ struct LineMaterial {
     color: vec4<f32>,
 };
 
-@group(1) @binding(0) var<uniform> material: LineMaterial;
+@group(2) @binding(0) var<uniform> material: LineMaterial;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/shader_defs.wgsl b/assets/shaders/shader_defs.wgsl
index 7b98daca05962..fdddc4caa1442 100644
--- a/assets/shaders/shader_defs.wgsl
+++ b/assets/shaders/shader_defs.wgsl
@@ -4,7 +4,7 @@ struct CustomMaterial {
     color: vec4<f32>,
 };
 
-@group(1) @binding(0) var<uniform> material: CustomMaterial;
+@group(2) @binding(0) var<uniform> material: CustomMaterial;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/show_prepass.wgsl b/assets/shaders/show_prepass.wgsl
index e80ea5c39d171..c1b3a89750227 100644
--- a/assets/shaders/show_prepass.wgsl
+++ b/assets/shaders/show_prepass.wgsl
@@ -11,7 +11,7 @@ struct ShowPrepassSettings {
     padding_1: u32,
     padding_2: u32,
 }
-@group(1) @binding(0) var<uniform> settings: ShowPrepassSettings;
+@group(2) @binding(0) var<uniform> settings: ShowPrepassSettings;
 
 @fragment
 fn fragment(
diff --git a/assets/shaders/texture_binding_array.wgsl b/assets/shaders/texture_binding_array.wgsl
index 440e3c6155700..de7a4e1b96eca 100644
--- a/assets/shaders/texture_binding_array.wgsl
+++ b/assets/shaders/texture_binding_array.wgsl
@@ -1,7 +1,7 @@
 #import bevy_pbr::forward_io::VertexOutput
 
-@group(1) @binding(0) var textures: binding_array<texture_2d<f32>>;
-@group(1) @binding(1) var nearest_sampler: sampler;
+@group(2) @binding(0) var textures: binding_array<texture_2d<f32>>;
+@group(2) @binding(1) var nearest_sampler: sampler;
 // We can also have array of samplers
 // var samplers: binding_array<sampler>;
 
diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs
index d5884bb65530c..04fd36d5a4917 100644
--- a/crates/bevy_pbr/src/material.rs
+++ b/crates/bevy_pbr/src/material.rs
@@ -87,9 +87,9 @@ use std::marker::PhantomData;
 /// In WGSL shaders, the material's binding would look like this:
 ///
 /// ```wgsl
-/// @group(1) @binding(0) var<uniform> color: vec4<f32>;
-/// @group(1) @binding(1) var color_texture: texture_2d<f32>;
-/// @group(1) @binding(2) var color_sampler: sampler;
+/// @group(2) @binding(0) var<uniform> color: vec4<f32>;
+/// @group(2) @binding(1) var color_texture: texture_2d<f32>;
+/// @group(2) @binding(2) var color_sampler: sampler;
 /// ```
 pub trait Material: Asset + AsBindGroup + Clone + Sized {
     /// Returns this material's vertex shader. If [`ShaderRef::Default`] is returned, the default mesh vertex shader
@@ -335,7 +335,7 @@ where
             descriptor.fragment.as_mut().unwrap().shader = fragment_shader.clone();
         }
 
-        descriptor.layout.insert(1, self.material_layout.clone());
+        descriptor.layout.insert(2, self.material_layout.clone());
 
         M::specialize(self, &mut descriptor, layout, key)?;
         Ok(descriptor)
@@ -368,8 +368,8 @@ impl<M: Material> FromWorld for MaterialPipeline<M> {
 type DrawMaterial<M> = (
     SetItemPipeline,
     SetMeshViewBindGroup<0>,
-    SetMaterialBindGroup<M, 1>,
-    SetMeshBindGroup<2>,
+    SetMeshBindGroup<1>,
+    SetMaterialBindGroup<M, 2>,
     DrawMesh,
 );
 
diff --git a/crates/bevy_pbr/src/prepass/mod.rs b/crates/bevy_pbr/src/prepass/mod.rs
index 67ed3b8362b13..1103eeef931d7 100644
--- a/crates/bevy_pbr/src/prepass/mod.rs
+++ b/crates/bevy_pbr/src/prepass/mod.rs
@@ -320,7 +320,7 @@ where
 
         // NOTE: Eventually, it would be nice to only add this when the shaders are overloaded by the Material.
         // The main limitation right now is that bind group order is hardcoded in shaders.
-        bind_group_layouts.insert(1, self.material_layout.clone());
+        bind_group_layouts.push(self.material_layout.clone());
 
         #[cfg(all(feature = "webgl", target_arch = "wasm32"))]
         shader_defs.push("WEBGL2".into());
@@ -421,7 +421,7 @@ where
             &mut shader_defs,
             &mut vertex_attributes,
         );
-        bind_group_layouts.insert(2, bind_group);
+        bind_group_layouts.insert(1, bind_group);
 
         let vertex_buffer_layout = layout.get_layout(&vertex_attributes)?;
 
@@ -919,8 +919,8 @@ impl<P: PhaseItem, const I: usize> RenderCommand<P> for SetPrepassViewBindGroup<
 pub type DrawPrepass<M> = (
     SetItemPipeline,
     SetPrepassViewBindGroup<0>,
-    SetMaterialBindGroup<M, 1>,
-    SetMeshBindGroup<2>,
+    SetMeshBindGroup<1>,
+    SetMaterialBindGroup<M, 2>,
     DrawMesh,
 );
 
diff --git a/crates/bevy_pbr/src/prepass/prepass_bindings.wgsl b/crates/bevy_pbr/src/prepass/prepass_bindings.wgsl
index 4e4e8c453f572..b574ef3fa4b4c 100644
--- a/crates/bevy_pbr/src/prepass/prepass_bindings.wgsl
+++ b/crates/bevy_pbr/src/prepass/prepass_bindings.wgsl
@@ -4,4 +4,4 @@
 @group(0) @binding(2) var<uniform> previous_view_proj: mat4x4<f32>;
 #endif // MOTION_VECTOR_PREPASS
 
-// Material bindings will be in @group(1)
+// Material bindings will be in @group(2)
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index e99499665645a..f54f576967509 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -339,9 +339,9 @@ pub struct MeshPipeline {
     /// Use code like this in custom shaders:
     /// ```wgsl
     /// ##ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-    /// @group(2) @binding(0) var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
+    /// @group(1) @binding(0) var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
     /// ##else
-    /// @group(2) @binding(0) var<storage> mesh: array<Mesh>;
+    /// @group(1) @binding(0) var<storage> mesh: array<Mesh>;
     /// ##endif // PER_OBJECT_BUFFER_BATCH_SIZE
     /// ```
     pub per_object_buffer_batch_size: Option<u32>,
diff --git a/crates/bevy_pbr/src/render/mesh_bindings.wgsl b/crates/bevy_pbr/src/render/mesh_bindings.wgsl
index 81cca44e6c591..2366dab155623 100644
--- a/crates/bevy_pbr/src/render/mesh_bindings.wgsl
+++ b/crates/bevy_pbr/src/render/mesh_bindings.wgsl
@@ -2,20 +2,8 @@
 
 #import bevy_pbr::mesh_types::Mesh
 
-#ifdef MESH_BINDGROUP_1
-
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
 @group(1) @binding(0) var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
 #else
 @group(1) @binding(0) var<storage> mesh: array<Mesh>;
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE
-
-#else // MESH_BINDGROUP_1
-
-#ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-@group(2) @binding(0) var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
-#else
-@group(2) @binding(0) var<storage> mesh: array<Mesh>;
-#endif // PER_OBJECT_BUFFER_BATCH_SIZE
-
-#endif // MESH_BINDGROUP_1
diff --git a/crates/bevy_pbr/src/render/morph.wgsl b/crates/bevy_pbr/src/render/morph.wgsl
index 7355f95f33e0c..bd6eb1d041832 100644
--- a/crates/bevy_pbr/src/render/morph.wgsl
+++ b/crates/bevy_pbr/src/render/morph.wgsl
@@ -4,19 +4,9 @@
 
 #import bevy_pbr::mesh_types::MorphWeights;
 
-#ifdef MESH_BINDGROUP_1
-
 @group(1) @binding(2) var<uniform> morph_weights: MorphWeights;
 @group(1) @binding(3) var morph_targets: texture_3d<f32>;
 
-#else
-
-@group(2) @binding(2) var<uniform> morph_weights: MorphWeights;
-@group(2) @binding(3) var morph_targets: texture_3d<f32>;
-
-#endif
-
-
 // NOTE: Those are the "hardcoded" values found in `MorphAttributes` struct
 // in crates/bevy_render/src/mesh/morph/visitors.rs
 // In an ideal world, the offsets are established dynamically and passed as #defines
diff --git a/crates/bevy_pbr/src/render/pbr_bindings.wgsl b/crates/bevy_pbr/src/render/pbr_bindings.wgsl
index c0e060ecab2a8..2f26e010b0614 100644
--- a/crates/bevy_pbr/src/render/pbr_bindings.wgsl
+++ b/crates/bevy_pbr/src/render/pbr_bindings.wgsl
@@ -2,24 +2,24 @@
 
 #import bevy_pbr::pbr_types::StandardMaterial
 
-@group(1) @binding(0) var<uniform> material: StandardMaterial;
-@group(1) @binding(1) var base_color_texture: texture_2d<f32>;
-@group(1) @binding(2) var base_color_sampler: sampler;
-@group(1) @binding(3) var emissive_texture: texture_2d<f32>;
-@group(1) @binding(4) var emissive_sampler: sampler;
-@group(1) @binding(5) var metallic_roughness_texture: texture_2d<f32>;
-@group(1) @binding(6) var metallic_roughness_sampler: sampler;
-@group(1) @binding(7) var occlusion_texture: texture_2d<f32>;
-@group(1) @binding(8) var occlusion_sampler: sampler;
-@group(1) @binding(9) var normal_map_texture: texture_2d<f32>;
-@group(1) @binding(10) var normal_map_sampler: sampler;
-@group(1) @binding(11) var depth_map_texture: texture_2d<f32>;
-@group(1) @binding(12) var depth_map_sampler: sampler;
+@group(2) @binding(0) var<uniform> material: StandardMaterial;
+@group(2) @binding(1) var base_color_texture: texture_2d<f32>;
+@group(2) @binding(2) var base_color_sampler: sampler;
+@group(2) @binding(3) var emissive_texture: texture_2d<f32>;
+@group(2) @binding(4) var emissive_sampler: sampler;
+@group(2) @binding(5) var metallic_roughness_texture: texture_2d<f32>;
+@group(2) @binding(6) var metallic_roughness_sampler: sampler;
+@group(2) @binding(7) var occlusion_texture: texture_2d<f32>;
+@group(2) @binding(8) var occlusion_sampler: sampler;
+@group(2) @binding(9) var normal_map_texture: texture_2d<f32>;
+@group(2) @binding(10) var normal_map_sampler: sampler;
+@group(2) @binding(11) var depth_map_texture: texture_2d<f32>;
+@group(2) @binding(12) var depth_map_sampler: sampler;
 #ifdef PBR_TRANSMISSION_TEXTURES_SUPPORTED
-@group(1) @binding(13) var specular_transmission_texture: texture_2d<f32>;
-@group(1) @binding(14) var specular_transmission_sampler: sampler;
-@group(1) @binding(15) var thickness_texture: texture_2d<f32>;
-@group(1) @binding(16) var thickness_sampler: sampler;
-@group(1) @binding(17) var diffuse_transmission_texture: texture_2d<f32>;
-@group(1) @binding(18) var diffuse_transmission_sampler: sampler;
+@group(2) @binding(13) var specular_transmission_texture: texture_2d<f32>;
+@group(2) @binding(14) var specular_transmission_sampler: sampler;
+@group(2) @binding(15) var thickness_texture: texture_2d<f32>;
+@group(2) @binding(16) var thickness_sampler: sampler;
+@group(2) @binding(17) var diffuse_transmission_texture: texture_2d<f32>;
+@group(2) @binding(18) var diffuse_transmission_sampler: sampler;
 #endif
diff --git a/crates/bevy_pbr/src/render/skinning.wgsl b/crates/bevy_pbr/src/render/skinning.wgsl
index 3f23629d1d4df..4307a22ddffa0 100644
--- a/crates/bevy_pbr/src/render/skinning.wgsl
+++ b/crates/bevy_pbr/src/render/skinning.wgsl
@@ -4,12 +4,7 @@
 
 #ifdef SKINNED
 
-#ifdef MESH_BINDGROUP_1
-    @group(1) @binding(1) var<uniform> joint_matrices: SkinnedMesh;
-#else 
-    @group(2) @binding(1) var<uniform> joint_matrices: SkinnedMesh;
-#endif
-
+@group(1) @binding(1) var<uniform> joint_matrices: SkinnedMesh;
 
 fn skin_model(
     indexes: vec4<u32>,
diff --git a/crates/bevy_pbr/src/render/wireframe.wgsl b/crates/bevy_pbr/src/render/wireframe.wgsl
index ed5c24b4b21f3..981e5e1b1db3e 100644
--- a/crates/bevy_pbr/src/render/wireframe.wgsl
+++ b/crates/bevy_pbr/src/render/wireframe.wgsl
@@ -4,7 +4,7 @@ struct WireframeMaterial {
     color: vec4<f32>,
 };
 
-@group(1) @binding(0)
+@group(2) @binding(0)
 var<uniform> material: WireframeMaterial;
 @fragment
 fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
diff --git a/crates/bevy_render/src/render_resource/bind_group.rs b/crates/bevy_render/src/render_resource/bind_group.rs
index 22ab55fd1292f..619d9b31afcc5 100644
--- a/crates/bevy_render/src/render_resource/bind_group.rs
+++ b/crates/bevy_render/src/render_resource/bind_group.rs
@@ -93,13 +93,13 @@ impl Deref for BindGroup {
 /// In WGSL shaders, the binding would look like this:
 ///
 /// ```wgsl
-/// @group(1) @binding(0) var<uniform> color: vec4<f32>;
-/// @group(1) @binding(1) var color_texture: texture_2d<f32>;
-/// @group(1) @binding(2) var color_sampler: sampler;
-/// @group(1) @binding(3) var<storage> values: array<f32>;
+/// @group(2) @binding(0) var<uniform> color: vec4<f32>;
+/// @group(2) @binding(1) var color_texture: texture_2d<f32>;
+/// @group(2) @binding(2) var color_sampler: sampler;
+/// @group(2) @binding(3) var<storage> values: array<f32>;
 /// ```
 /// Note that the "group" index is determined by the usage context. It is not defined in [`AsBindGroup`]. For example, in Bevy material bind groups
-/// are generally bound to group 1.
+/// are generally bound to group 2.
 ///
 /// The following field-level attributes are supported:
 ///
@@ -191,7 +191,7 @@ impl Deref for BindGroup {
 ///     roughness: f32,
 /// };
 ///
-/// @group(1) @binding(0) var<uniform> material: CoolMaterial;
+/// @group(2) @binding(0) var<uniform> material: CoolMaterial;
 /// ```
 ///
 /// Some less common scenarios will require "struct-level" attributes. These are the currently supported struct-level attributes:
diff --git a/crates/bevy_sprite/src/mesh2d/color_material.wgsl b/crates/bevy_sprite/src/mesh2d/color_material.wgsl
index 1ed5d75341b0c..7bc772511681b 100644
--- a/crates/bevy_sprite/src/mesh2d/color_material.wgsl
+++ b/crates/bevy_sprite/src/mesh2d/color_material.wgsl
@@ -14,9 +14,9 @@ struct ColorMaterial {
 };
 const COLOR_MATERIAL_FLAGS_TEXTURE_BIT: u32 = 1u;
 
-@group(1) @binding(0) var<uniform> material: ColorMaterial;
-@group(1) @binding(1) var texture: texture_2d<f32>;
-@group(1) @binding(2) var texture_sampler: sampler;
+@group(2) @binding(0) var<uniform> material: ColorMaterial;
+@group(2) @binding(1) var texture: texture_2d<f32>;
+@group(2) @binding(2) var texture_sampler: sampler;
 
 @fragment
 fn fragment(
diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs
index d58fdfb7e3ac8..f1e23415d06fe 100644
--- a/crates/bevy_sprite/src/mesh2d/material.rs
+++ b/crates/bevy_sprite/src/mesh2d/material.rs
@@ -95,9 +95,9 @@ use crate::{
 ///     color: vec4<f32>,
 /// }
 ///
-/// @group(1) @binding(0) var<uniform> material: CustomMaterial;
-/// @group(1) @binding(1) var color_texture: texture_2d<f32>;
-/// @group(1) @binding(2) var color_sampler: sampler;
+/// @group(2) @binding(0) var<uniform> material: CustomMaterial;
+/// @group(2) @binding(1) var color_texture: texture_2d<f32>;
+/// @group(2) @binding(2) var color_sampler: sampler;
 /// ```
 pub trait Material2d: AsBindGroup + Asset + Clone + Sized {
     /// Returns this material's vertex shader. If [`ShaderRef::Default`] is returned, the default mesh vertex shader
@@ -281,8 +281,8 @@ where
         }
         descriptor.layout = vec![
             self.mesh2d_pipeline.view_layout.clone(),
-            self.material2d_layout.clone(),
             self.mesh2d_pipeline.mesh_layout.clone(),
+            self.material2d_layout.clone(),
         ];
 
         M::specialize(&mut descriptor, layout, key)?;
@@ -317,8 +317,8 @@ impl<M: Material2d> FromWorld for Material2dPipeline<M> {
 type DrawMaterial2d<M> = (
     SetItemPipeline,
     SetMesh2dViewBindGroup<0>,
-    SetMaterial2dBindGroup<M, 1>,
-    SetMesh2dBindGroup<2>,
+    SetMesh2dBindGroup<1>,
+    SetMaterial2dBindGroup<M, 2>,
     DrawMesh2d,
 );
 
diff --git a/crates/bevy_sprite/src/mesh2d/mesh2d_bindings.wgsl b/crates/bevy_sprite/src/mesh2d/mesh2d_bindings.wgsl
index 3c3ec0906efcc..fc2bf643d5437 100644
--- a/crates/bevy_sprite/src/mesh2d/mesh2d_bindings.wgsl
+++ b/crates/bevy_sprite/src/mesh2d/mesh2d_bindings.wgsl
@@ -2,20 +2,8 @@
 
 #import bevy_sprite::mesh2d_types::Mesh2d
 
-#ifdef MESH_BINDGROUP_1
-
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
 @group(1) @binding(0) var<uniform> mesh: array<Mesh2d, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
 #else
 @group(1) @binding(0) var<storage> mesh: array<Mesh2d>;
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE
-
-#else // MESH_BINDGROUP_1
-
-#ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-@group(2) @binding(0) var<uniform> mesh: array<Mesh2d, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
-#else
-@group(2) @binding(0) var<storage> mesh: array<Mesh2d>;
-#endif // PER_OBJECT_BUFFER_BATCH_SIZE
-
-#endif // MESH_BINDGROUP_1
diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs
index a940ed142fc77..bf3501c2a0600 100644
--- a/examples/2d/mesh2d_manual.rs
+++ b/examples/2d/mesh2d_manual.rs
@@ -151,24 +151,19 @@ impl SpecializedRenderPipeline for ColoredMesh2dPipeline {
             false => TextureFormat::bevy_default(),
         };
 
-        // Meshes typically live in bind group 2. Because we are using bind group 1
-        // we need to add the MESH_BINDGROUP_1 shader def so that the bindings are correctly
-        // linked in the shader.
-        let shader_defs = vec!["MESH_BINDGROUP_1".into()];
-
         RenderPipelineDescriptor {
             vertex: VertexState {
                 // Use our custom shader
                 shader: COLORED_MESH2D_SHADER_HANDLE,
                 entry_point: "vertex".into(),
-                shader_defs: shader_defs.clone(),
+                shader_defs: vec![],
                 // Use our custom vertex buffer
                 buffers: vec![vertex_layout],
             },
             fragment: Some(FragmentState {
                 // Use our custom shader
                 shader: COLORED_MESH2D_SHADER_HANDLE,
-                shader_defs,
+                shader_defs: vec![],
                 entry_point: "fragment".into(),
                 targets: vec![Some(ColorTargetState {
                     format,
diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs
index 3ff58c0b963e7..8186b0d74d357 100644
--- a/examples/shader/shader_instancing.rs
+++ b/examples/shader/shader_instancing.rs
@@ -204,14 +204,6 @@ impl SpecializedMeshPipeline for CustomPipeline {
     ) -> Result<RenderPipelineDescriptor, SpecializedMeshPipelineError> {
         let mut descriptor = self.mesh_pipeline.specialize(key, layout)?;
 
-        // meshes typically live in bind group 2. because we are using bindgroup 1
-        // we need to add MESH_BINDGROUP_1 shader def so that the bindings are correctly
-        // linked in the shader
-        descriptor
-            .vertex
-            .shader_defs
-            .push("MESH_BINDGROUP_1".into());
-
         descriptor.vertex.shader = self.shader.clone();
         descriptor.vertex.buffers.push(VertexBufferLayout {
             array_stride: std::mem::size_of::<InstanceData>() as u64,
diff --git a/examples/shader/texture_binding_array.rs b/examples/shader/texture_binding_array.rs
index 82bcf34acc6ab..91c23479c6322 100644
--- a/examples/shader/texture_binding_array.rs
+++ b/examples/shader/texture_binding_array.rs
@@ -146,7 +146,7 @@ impl AsBindGroup for BindlessMaterial {
         Self: Sized,
     {
         vec![
-            // @group(1) @binding(0) var textures: binding_array<texture_2d<f32>>;
+            // @group(2) @binding(0) var textures: binding_array<texture_2d<f32>>;
             BindGroupLayoutEntry {
                 binding: 0,
                 visibility: ShaderStages::FRAGMENT,
@@ -157,7 +157,7 @@ impl AsBindGroup for BindlessMaterial {
                 },
                 count: NonZeroU32::new(MAX_TEXTURE_COUNT as u32),
             },
-            // @group(1) @binding(1) var nearest_sampler: sampler;
+            // @group(2) @binding(1) var nearest_sampler: sampler;
             BindGroupLayoutEntry {
                 binding: 1,
                 visibility: ShaderStages::FRAGMENT,