diff --git a/cfengine-ci/cfengine-ci-buildhost.cf b/cfengine-ci/cfengine-ci-buildhost.cf
index 4aab85c..f9ffc62 100644
--- a/cfengine-ci/cfengine-ci-buildhost.cf
+++ b/cfengine-ci/cfengine-ci-buildhost.cf
@@ -46,6 +46,8 @@ bundle agent cfengine_ci_buildhost
   classes:
     debian_11::
       "have_pip2" expression => fileexists("/usr/local/bin/pip");
+    ubuntu_16::
+      "have_i386_architecture" expression => strcmp(execresult("${paths.dpkg} --print-foreign-architectures"), "i386");
 
   files:
     debian_9::
@@ -57,9 +59,11 @@ bundle agent cfengine_ci_buildhost
     debian_11.!have_pip2::
       "wget https://bootstrap.pypa.io/pip/2.7/get-pip.py -O get-pip.py && python2 get-pip.py && pip install psycopg2-binary"
         contain => in_shell;
-    ubuntu_16:: # mingw host
+    ubuntu_16.!have_i386_architecture:: # mingw build host
       "${paths.dpkg} --add-architecture i386";
+# TODO WHY ,,,,
     ubuntu:: # hack for aws ubuntu hosts
       "${paths.sed} -ri 's/localhost //' /etc/hosts";
+# TODO test in AWS both of these hacks to know how to detect and promise
       "/usr/bin/hostnamectl set-hostname localhost.localdomain";
 }