diff --git a/kolla/common/config.py b/kolla/common/config.py
index 047963498c..d9f7fb91b7 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -19,6 +19,7 @@ from kolla.version import version_info as version
 
 
 BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian']
+BASE_ARCH = ['x86_64']
 DISTRO_RELEASE = {
     'centos': '7',
     'rhel': '7',
@@ -154,6 +155,9 @@ _CLI_OPTS = [
                help='The base distro image tag'),
     cfg.StrOpt('base-image',
                help='The base image name. Default is the same with base'),
+    cfg.StrOpt('base-arch', default='x86_64',
+               choices=BASE_ARCH,
+               help='The base architecture.'),
     cfg.BoolOpt('debug', short='d', default=False,
                 help='Turn on debugging log level'),
     cfg.DictOpt('build-args',
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 7db9a24a00..fa0843f1d1 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -530,6 +530,7 @@ class KollaWorker(object):
         self.base_tag = conf.base_tag
         self.install_type = conf.install_type
         self.tag = conf.tag
+        self.base_arch = conf.base_arch
         self.images = list()
         rpm_setup_config = ([repo_file for repo_file in
                              conf.rpm_setup_config if repo_file is not None])
@@ -699,6 +700,7 @@ class KollaWorker(object):
             values = {'base_distro': self.base,
                       'base_image': self.conf.base_image,
                       'base_distro_tag': self.base_tag,
+                      'base_arch': self.base_arch,
                       'supported_distro_release': supported_distro_release,
                       'install_metatype': self.install_metatype,
                       'image_prefix': self.image_prefix,
diff --git a/releasenotes/notes/non-x86-support-bce168d78db50202.yaml b/releasenotes/notes/non-x86-support-bce168d78db50202.yaml
new file mode 100644
index 0000000000..ad32ec2a3c
--- /dev/null
+++ b/releasenotes/notes/non-x86-support-bce168d78db50202.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - New CLI argument "--base-arch" allows to select which architecture is
+    targetted by build.