diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile
index 0e46ea2..54429a3 100644
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@@ -12,9 +12,6 @@ RUN \
     git config --global user.name "Builder" && \
     mkdir /opt/ffbuild
 
-# Work around cmake bug
-RUN sed -i 's/.*__SUNPRO_C.*/ FALSE )/' /usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake
-
 ADD run_stage.sh /usr/bin/run_stage
 ADD git-mini-clone.sh /usr/bin/git-mini-clone
 ADD check-wget.sh /usr/bin/check-wget
diff --git a/images/base-linux64/toolchain.cmake b/images/base-linux64/toolchain.cmake
index b4989ce..544b80d 100644
--- a/images/base-linux64/toolchain.cmake
+++ b/images/base-linux64/toolchain.cmake
@@ -10,3 +10,5 @@ set(CMAKE_FIND_ROOT_PATH /usr/x86_64-alpine-linux-musl /opt/ffbuild)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_POLICY_DEFAULT_CMP0054 NEW)