diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 4ac47705f456df39aaae5334c32481e33c86f510..ed2c7c14c0cb40f18a424df7fe922d3b2de9e5a1 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 NETINST=true
 . ./config
 
@@ -29,6 +29,9 @@ EOF
 
 rm debian/apt-mirror-setup.templates-ubuntu
 
+# Remove multiarch support
+sed '/chroot/,$d' generators/01setup -i
+
 # getline "seed" file
 getline(){
 grep -n "$1" "$2" |cut -d: -f1