diff --git a/manifests/site.pp b/manifests/site.pp
index 955594915f..8d2a90eb8e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -307,6 +307,20 @@ node 'lists.openstack.org' {
   }
 }
 
+# Node-OS: trusty
+node 'lists.katacontainers.io' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [25, 80, 465],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
+
+  class { 'openstack_project::kata_lists':
+    listadmins   => hiera('listadmins', []),
+    listpassword => hiera('listpassword'),
+  }
+}
+
 # Node-OS: trusty
 node 'paste.openstack.org' {
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/manifests/kata_lists.pp b/modules/openstack_project/manifests/kata_lists.pp
new file mode 100644
index 0000000000..614cfdb686
--- /dev/null
+++ b/modules/openstack_project/manifests/kata_lists.pp
@@ -0,0 +1,38 @@
+# == Class: openstack_project::kata_lists
+#
+class openstack_project::kata_lists(
+  $listadmins,
+  $listpassword = ''
+) {
+  $listdomain = 'lists.katacontainers.io'
+
+  class { 'exim':
+    sysadmins                => $listadmins,
+    queue_interval           => '1m',
+    queue_run_max            => '50',
+    mailman_domains          => [$listdomain],
+    smtp_accept_max          => '100',
+    smtp_accept_max_per_host => '10',
+  }
+
+  class { 'mailman':
+    vhost_name => $listdomain,
+  }
+
+  realize (
+    User::Virtual::Localuser['jbryce'],
+  )
+
+  Maillist {
+    provider    => 'noaliasmailman',
+  }
+
+  maillist { 'kata-dev':
+    ensure      => present,
+    admin       => 'jonathan@openstack.org',
+    password    => $listpassword,
+    description => 'Kata Containers Development Mailing List (not for usage questions)',
+    webserver   => $listdomain,
+    mailserver  => $listdomain,
+  }
+}
diff --git a/modules/openstack_project/manifests/users.pp b/modules/openstack_project/manifests/users.pp
index 07b3314fa1..03096411e3 100644
--- a/modules/openstack_project/manifests/users.pp
+++ b/modules/openstack_project/manifests/users.pp
@@ -241,4 +241,12 @@ class openstack_project::users {
     gid      => 2026,
   }
 
+  @user::virtual::localuser { 'jbryce':
+    realname => 'Jonathan Bryce',
+    sshkeys  => 'AAAAB3NzaC1yc2EAAAABIwAAAQEApFGM9q1gfiawBX5EnCQGxx2T1hwPDxrX2M64MfqcoBRpdrWRjxWm6Vhczfl+Ar2EQtGsuIm1QQiyiPL4zsJSQOfYXB0TqOQaAuFamSzZSNEm8coSa93E3zfXR9uln1lgCGutaWwH/KmGcSeAuuQCipKmKxc8QSAepGNP4Jx2L/EnXQh850xTQEIviJkJpA9oTRzXu12T7vzxsUCw041Q/KX16UvvGpt9IAoMAWFlQrMPzPFmqbUOIr7pRvv8TKcK9BNFS8S8jjT+wN0y/LY7cbTblgDfwSAl1P/naME5ugRVD5MZKixIE1F+x/j+M8+fpZ/EyR/6jSA3DYjEXOk2zQ==',
+    key_id   => 'jbryce@jbryce-mbp-3.local',
+    uid      => 2027,
+    gid      => 2027,
+  }
+
 }