diff --git a/src/world/camera.rs b/src/world/camera.rs
index 8780181..c315d1e 100644
--- a/src/world/camera.rs
+++ b/src/world/camera.rs
@@ -4,7 +4,7 @@ use bevy::render::camera::ScalingMode;
 use bevy::render::view::screenshot::ScreenshotManager;
 use bevy::window::{PrimaryWindow, WindowMode};
 use bevy_kira_audio::prelude::AudioReceiver;
-use bevy_rapier2d::dynamics::Velocity;
+use bevy_rapier2d::plugin::PhysicsSet;
 
 use super::camera_shake::{update_camera, CameraShake};
 use crate::player::input::PlayerInput;
@@ -15,9 +15,6 @@ use crate::GameState;
 // How much `1.0` in bevy coordinates translates to the pixels of a sprite.
 // Only relevant for the ysorting.
 pub const TRANSLATION_TO_PIXEL: f32 = 0.0001;
-// This is not changing the actual timestep,
-// it's just a way to reduce magic numbers in code.
-const RAPIER_TIMESTEP: f32 = 60.0;
 
 #[derive(Component)]
 pub struct MainCamera;
@@ -37,19 +34,12 @@ fn spawn_camera(mut commands: Commands) {
     commands.spawn((MainCamera, AudioReceiver, camera));
 }
 
-fn update_camera_target(
-    mut shake: ResMut<CameraShake>,
-    q_player: Query<(&Transform, &Velocity), With<Player>>,
-) {
-    let (player_pos, player_vel) = match q_player.get_single() {
-        Ok(p) => (p.0.translation, p.1),
+fn update_camera_target(mut shake: ResMut<CameraShake>, q_player: Query<&Transform, With<Player>>) {
+    let player_transform = match q_player.get_single() {
+        Ok(r) => r,
         Err(_) => return,
     };
-
-    shake.update_target(Vec2::new(
-        player_pos.x + player_vel.linvel.x / RAPIER_TIMESTEP,
-        player_pos.y + player_vel.linvel.y / RAPIER_TIMESTEP,
-    ));
+    shake.update_target(player_transform.translation.truncate());
 }
 
 fn zoom_camera(
@@ -137,6 +127,12 @@ impl Plugin for CameraPlugin {
             ),
         )
         .add_systems(OnEnter(GameState::Gaming), spawn_camera)
-        .add_systems(PostUpdate, update_camera_target.before(update_camera));
+        .add_systems(
+            PostUpdate,
+            update_camera_target
+                .after(PhysicsSet::Writeback)
+                .before(TransformSystem::TransformPropagate)
+                .before(update_camera),
+        );
     }
 }
diff --git a/src/world/camera_shake.rs b/src/world/camera_shake.rs
index fd9bd2f..2057abd 100644
--- a/src/world/camera_shake.rs
+++ b/src/world/camera_shake.rs
@@ -79,6 +79,9 @@ impl Plugin for CameraShakePlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Update, (decay_shake_trauma,))
             .init_resource::<CameraShake>()
-            .add_systems(PostUpdate, update_camera);
+            .add_systems(
+                PostUpdate,
+                update_camera.before(TransformSystem::TransformPropagate),
+            );
     }
 }