diff --git a/roles/accounts/tasks/main.yml b/roles/accounts/tasks/main.yml
index 4805b2a..704d908 100644
--- a/roles/accounts/tasks/main.yml
+++ b/roles/accounts/tasks/main.yml
@@ -4,6 +4,11 @@
     name: "{{ evolinux_sudo_group }}"
     system: true
 
+- name: "Create {{ evolinux_ssh_group }}"
+  group:
+    name: "{{ evolinux_ssh_group }}"
+    system: true
+
 - name: Create user accounts
   include: user.yml
   vars:
diff --git a/roles/accounts/tasks/user.yml b/roles/accounts/tasks/user.yml
index 03af553..568753b 100644
--- a/roles/accounts/tasks/user.yml
+++ b/roles/accounts/tasks/user.yml
@@ -30,3 +30,11 @@
     append: true
   tags:
     - admin
+
+- name: "Add {{ user.name }} to {{ evolinux_ssh_group }} group"
+  user:
+    name: "{{ user.name }}"
+    groups: "{{ evolinux_ssh_group }}"
+    append: true
+  tags:
+    - admin