diff --git a/docker-compose.yml b/docker-compose.yml
index 863cbd2ea9b1b..2add116a90234 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
   # The PHP container.
   ##
   php:
-    image: wordpressdevelop/php:${LOCAL_PHP-latest}
+    image: ghcr.io/wordpress/wpdev-docker-images/php:${LOCAL_PHP-latest}-189
 
     networks:
       - wpdevnet
@@ -95,7 +95,7 @@ services:
   # The WP CLI container.
   ##
   cli:
-    image: wordpressdevelop/cli:${LOCAL_PHP-latest}
+    image: ghcr.io/wordpress/wpdev-docker-images/cli:${LOCAL_PHP-latest}-189
 
     networks:
       - wpdevnet
diff --git a/tests/phpunit/tests/image/resize.php b/tests/phpunit/tests/image/resize.php
index 1c7e65bff222f..6bbf4a2260e69 100644
--- a/tests/phpunit/tests/image/resize.php
+++ b/tests/phpunit/tests/image/resize.php
@@ -87,15 +87,23 @@ public function test_resize_webp() {
 	 * Test resizing AVIF image.
 	 *
 	 * @ticket 51228
-	 *
-	 * Temporarily disabled until we can figure out why it fails on the Trixie based PHP container.
-	 * See https://core.trac.wordpress.org/ticket/63932.
-	 * @requires PHP < 8.3
 	 */
 	public function test_resize_avif() {
 		$file   = DIR_TESTDATA . '/images/avif-lossy.avif';
 		$editor = wp_get_image_editor( $file );
 
+		if ( 'WP_Image_Editor_GD' === $this->editor_engine && PHP_VERSION < 80100 ) {
+			$this->markTestSkipped( 'AVIF is only supported in GD with PHP >= 8.1.' );
+		}
+
+		if ( 'WP_Image_Editor_Imagick' === $this->editor_engine ) {
+			$version = Imagick::getVersion();
+
+			if ( $version['versionNumber'] >= 0x700 ) {
+				$this->markTestSkipped( 'ImageMagick 7 is unable to perform this test at this time.' );
+			}
+		}
+
 		// Check if the editor supports the avif mime type.
 		if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/avif' ) ) {
 			$this->markTestSkipped( sprintf( 'No AVIF support in the editor engine %s on this system.', $this->editor_engine ) );