diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13af3c9e..3e4c591d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - #588 - fix ci: bump openssl version in freebsd again
 - #552 - Added CHANGELOG.md automation
 - #543 - Added environment variables to control the UID and GID in the container
+- #538 - changed default container engine to podman
 - #534 - fix image builds with update of dependencies
 - #524 - docker: Add Nix Store volume support
 - #502 - fix ci: bump openssl version in freebsd
diff --git a/src/docker.rs b/src/docker.rs
index d9e0ba394..3639e87af 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -18,6 +18,8 @@ const PODMAN: &str = "podman";
 fn get_container_engine() -> Result<std::path::PathBuf, which::Error> {
     if let Ok(ce) = env::var("CROSS_CONTAINER_ENGINE") {
         which::which(ce)
+    } else if cfg!(target_os = "linux") {
+        which::which(PODMAN).or_else(|_| which::which(DOCKER))
     } else {
         which::which(DOCKER).or_else(|_| which::which(PODMAN))
     }