diff --git a/build/scripts/build_helper b/build/scripts/build_helper
index 0812a5081af8350a647d948ec9509cc695b80630..de564da0373a6d060c7418d386c6b4fd25c8213c 100644
--- a/build/scripts/build_helper
+++ b/build/scripts/build_helper
@@ -32,8 +32,8 @@ fi
 OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
 OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
 case "$OS_DISTRO" in
-  fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
-  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake" ;;
+  fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;;
+  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
   centos) OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
   debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
   ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
diff --git a/build/scripts/build_helper.amf b/build/scripts/build_helper.amf
index 5f59899f5cca0637d3daa3cbe0e630fd520503b5..1f121fb9454b3f2bf201ce67916297a19648f54b 100755
--- a/build/scripts/build_helper.amf
+++ b/build/scripts/build_helper.amf
@@ -110,7 +110,7 @@ install_pistache_from_git() {
         -DPISTACHE_BUILD_EXAMPLES=false \
         -DPISTACHE_BUILD_TESTS=false \
         -DPISTACHE_BUILD_DOCS=false \
-        .. 
+        ..
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     make -j $(nproc)
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
@@ -270,7 +270,7 @@ check_install_amf_deps(){
    
   if [ $1 -gt 0 ]; then
     OPTION="-y"
-  else 
+  else
     OPTION=""
   fi
   if [ $2 -eq 0 ]; then
@@ -279,7 +279,7 @@ check_install_amf_deps(){
     debug=1
   fi
 
-  echo "Check supported distribution" 
+  echo "Check supported distribution"
   check_supported_distribution
   [[ $? -ne 0 ]] && return $?
 
@@ -321,22 +321,22 @@ check_install_amf_deps(){
   echo "Install build tools"
   $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
   ret=$?;[[ $ret -ne 0 ]] && return $ret
-  
+
   # Libraries
   if [[ $OS_DISTRO == "ubuntu" ]]; then
     case "$(get_distribution_release)" in
       "ubuntu18.04")
-      # Currently Ubuntu18.04 has boost 1.65 as the latest
-      # We need at least 1.66
-      # PPA has 1.67
-      $SUDO $INSTALLER install $OPTION software-properties-common
-      $SUDO add-apt-repository ppa:mhier/libboost-latest --yes
-      $SUDO $INSTALLER update
-      if [ $IS_CONTAINER -eq 0 ]; then
-        specific_packages="libconfig++-dev libasio-dev libboost-all-dev mysql-server libasan4"
-      else
-        specific_packages="libconfig++-dev libasio-dev libboost-all-dev libasan4"
-      fi
+        # Currently Ubuntu18.04 has boost 1.65 as the latest
+        # We need at least 1.66
+        # PPA has 1.67
+        $SUDO $INSTALLER install $OPTION software-properties-common
+        $SUDO add-apt-repository ppa:mhier/libboost-latest --yes
+        $SUDO $INSTALLER update
+        if [ $IS_CONTAINER -eq 0 ]; then
+          specific_packages="libconfig++-dev libasio-dev libboost-all-dev mysql-server libasan4"
+        else
+          specific_packages="libconfig++-dev libasio-dev libboost-all-dev libasan4"
+        fi
         ;;
       "ubuntu20.04")
         specific_packages="libconfig++-dev libasio-dev libboost-all-dev libasan5"
@@ -399,19 +399,19 @@ check_install_amf_deps(){
         $SUDO $INSTALLER install $OPTION libboost1.67-dev
         ;;
     esac
-  fi  
+  fi
 
   ret=$?;[[ $ret -ne 0 ]] && return $ret
   echo "distro libs installation complete"
 
   install_spdlog_from_git $1 $2
-  ret=$?;[[ $ret -ne 0 ]] && return $ret 
+  ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   install_pistache_from_git $1 $2
   ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   install_nlohmann_from_git $1 $2
-  ret=$?;[[ $ret -ne 0 ]] && return $ret 
+  ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   install_nghttp2_from_git $1 $2
   ret=$?;[[ $ret -ne 0 ]] && return $ret
diff --git a/ci-scripts/flatten_image.py b/ci-scripts/flatten_image.py
index f43141bcec20b436ce93344f0172b43d0e9617c2..6bdeeb41d0c7a61dfbb2cd4bd6c10dd41c35a751 100644
--- a/ci-scripts/flatten_image.py
+++ b/ci-scripts/flatten_image.py
@@ -49,6 +49,9 @@ def perform_flattening(tag):
     if re.search('podman', podman_check.strip()):
         cli = 'sudo podman'
         image_prefix = 'localhost/'
+        # since HEALTHCHECK is not supported by podman import
+        # we don't flatten
+        return 0
     if cli == '':
         cmd = 'which docker || true'
         docker_check = subprocess.check_output(cmd, shell=True, universal_newlines=True)
@@ -76,6 +79,7 @@ def perform_flattening(tag):
     cmd += ' --change "EXPOSE 9090/tcp" '
     if cli == 'docker':
         cmd += ' --change "EXPOSE 38412/sctp" '
+    cmd += ' --change "HEALTHCHECK --interval=10s --timeout=15s --retries=6 CMD /openair-amf/bin/healthcheck.sh" '
     cmd += ' --change "CMD [\\"/openair-amf/bin/oai_amf\\", \\"-c\\", \\"/openair-amf/etc/amf.conf\\", \\"-o\\"]" '
     cmd += ' --change "ENTRYPOINT [\\"/bin/bash\\", \\"/openair-amf/bin/entrypoint.sh\\"]" '
     cmd += ' - ' + image_prefix + tag