diff --git a/ogcp/templates/actions/client_details.html b/ogcp/templates/actions/client_details.html
index 39963bd..d4158bf 100644
--- a/ogcp/templates/actions/client_details.html
+++ b/ogcp/templates/actions/client_details.html
@@ -10,4 +10,28 @@
                   button_map={'create': 'primary'},
                   extra_classes="mx-5") }}
 
+<table class="table">
+    <tbody class="text-center">
+        <tr>
+            <th>Partition</th>
+            <th>Type</th>
+            <th>Filesytem</th>
+            <th>Size (KB)</th>
+            <th>Image</th>
+            <th colspan="2"></th>
+        </tr>
+    </tbody>
+    <tbody class="text-center">
+    {% for entry in setup %}
+        <tr>
+            <td>{{ entry.partition }}</td>
+            <td>{{ entry.code }}</td>
+            <td>{{ entry.filesystem }}</td>
+            <td>{{ entry.size }}</td>
+            <td>{{ entry.image }}</td>
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
 {% endblock %}
diff --git a/ogcp/views.py b/ogcp/views.py
index a42642f..77e63ac 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -527,7 +527,21 @@ def action_client_info():
     form.room.choices = list(rooms)
 
     form.create.render_kw = {"style": "visibility:hidden;"}
-    return render_template('actions/client_details.html', form=form)
+
+    r = g.server.get('/images')
+    images = r.json()['images']
+
+    setup = get_client_setup(ips)
+
+    for entry in setup:
+        if entry['image'] != 0:
+            image = next(img for img in images if img['id'] == entry['image'])
+            entry['image'] = image['name']
+        else:
+            entry['image'] = ""
+
+    return render_template('actions/client_details.html', form=form,
+                           setup=setup)
 
 @app.route('/action/client/add', methods=['GET', 'POST'])
 @login_required