diff --git a/.github/workflows/premerge-ci-buildspec.yml b/.github/workflows/premerge-ci-buildspec.yml
index 07a1f9c848..29fe09ba50 100644
--- a/.github/workflows/premerge-ci-buildspec.yml
+++ b/.github/workflows/premerge-ci-buildspec.yml
@@ -22,9 +22,10 @@ phases:
         bash -c '
         function retry_scp() {
           local retries=5
-          local wait_time=10
+          local wait_time=30
           local count=0
           while [ $count -lt $retries ]; do
+            sleep $wait_time
             scp -r $SRC_DIR ubuntu@$EC2_INSTANCE_IP:~
             if [ $? -eq 0 ]; then
               echo "SCP command succeeded"
@@ -32,7 +33,6 @@ phases:
             fi
             count=$((count + 1))
             echo "SCP command failed. Retrying in $wait_time seconds..."
-            sleep $wait_time
           done
           echo "SCP command failed after $retries attempts."
           return 1
@@ -41,7 +41,7 @@ phases:
         '
       - ssh ubuntu@$EC2_INSTANCE_IP "docker login -u \\\$oauthtoken -p $NGC_TOKEN nvcr.io"
       - ssh ubuntu@$EC2_INSTANCE_IP "cd $SRC_DIR;
-          docker build -t isaac-lab-dev --build-arg ISAACSIM_VERSION_ARG=4.2.0 --build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim --build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab --build-arg DOCKER_USER_HOME_ARG=/root -f docker/Dockerfile.base . ;
+          DOCKER_BUILDKIT=1 docker build -t isaac-lab-dev --build-arg ISAACSIM_VERSION_ARG=4.2.0 --build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim --build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab --build-arg DOCKER_USER_HOME_ARG=/root -f docker/Dockerfile.base . ;
           docker run --rm --entrypoint bash --gpus all --network=host --name isaac-lab-test isaac-lab-dev ./isaaclab.sh -t &&
           exit $?"
   post_build:
diff --git a/source/extensions/omni.isaac.lab/test/sensors/test_camera.py b/source/extensions/omni.isaac.lab/test/sensors/test_camera.py
index ca4bef5d80..fc6953e166 100644
--- a/source/extensions/omni.isaac.lab/test/sensors/test_camera.py
+++ b/source/extensions/omni.isaac.lab/test/sensors/test_camera.py
@@ -260,9 +260,9 @@ def test_multi_camera_with_different_resolution(self):
         cam_2.update(self.dt)
         # check image sizes
         self.assertEqual(
-            cam_1.data.output["distance_to_image_plane"].shape, (1, self.camera_cfg.height, self.camera_cfg.width)
+            cam_1.data.output["distance_to_image_plane"].shape, (1, self.camera_cfg.height, self.camera_cfg.width, 1)
         )
-        self.assertEqual(cam_2.data.output["distance_to_image_plane"].shape, (1, cam_cfg_2.height, cam_cfg_2.width))
+        self.assertEqual(cam_2.data.output["distance_to_image_plane"].shape, (1, cam_cfg_2.height, cam_cfg_2.width, 1))
 
     def test_camera_init_intrinsic_matrix(self):
         """Test camera initialization from intrinsic matrix."""