diff --git a/tuskar_boxes/overview/views.py b/tuskar_boxes/overview/views.py
index c64f3e3..baca1f1 100644
--- a/tuskar_boxes/overview/views.py
+++ b/tuskar_boxes/overview/views.py
@@ -19,12 +19,12 @@ from tuskar_boxes.overview import forms
 
 def flavor_nodes(request, flavor):
     """Lists all nodes that match the given flavor exactly."""
-    for node in api.node.Node.list(request):
+    for node in api.node.Node.list(request, maintenance=False):
         if all([
             int(node.cpus) == int(flavor.vcpus),
             int(node.memory_mb) == int(flavor.ram),
             int(node.local_gb) == int(flavor.disk),
-            # TODO(rdopieralski) add architecture when available
+            node.cpu_arch == flavor.cpu_arch,
         ]):
             yield node
 
@@ -52,6 +52,7 @@ class IndexView(views.IndexView):
                 'vcpus': flavor.vcpus,
                 'ram': flavor.ram,
                 'disk': flavor.disk,
+                'cpu_arch': flavor.cpu_arch,
                 'nodes': nodes,
                 'roles': roles,
             }
diff --git a/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html b/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
index 0367ec5..e3a2f07 100644
--- a/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
+++ b/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
@@ -16,12 +16,13 @@
 {% endspaceless %}{% endfor %}
 </div>
 
-<h4>{% trans "Available Node Profiles" %}</h4>
+<h4>{% trans "Available Flavors" %}</h4>
 {% for flavor in flavors %}
 <div class="boxes-flavor" data-flavor="{{ flavor.name }}">
     <p>
-        <strong>Node Profile:</strong>
+    <strong>{% trans "Flavor:" %}</strong>
         <i>{{ flavor.name }}</i>
+        {{ flavor.cpu_arch }},
         {{ flavor.vcpus }} CPU,
         {{ flavor.ram }}MB RAM,
         {{ flavor.disk }}GB Disk