diff --git a/network.yml b/network.yml
index 7abff83e..62c79678 100644
--- a/network.yml
+++ b/network.yml
@@ -18,7 +18,17 @@
   roles:
     - bind-recursive
 
-
 # Deploy firewall
 - hosts: gulp.adm.crans.org
   roles: []  # TODO
+
+# Deploy Unifi Controller
+- hosts: unifi.adm.crans.org
+  vars:
+    # Indicate service in motd
+    motd_role:
+      name: unifi-controller
+      verbose_name: Le contrôleur Unifi
+  roles:
+    - unifi-controller
+    - motd-role
diff --git a/roles/motd-role/templates/update-motd.d/05-service.j2 b/roles/motd-role/templates/update-motd.d/05-service.j2
index 75d15625..f78d7d29 100755
--- a/roles/motd-role/templates/update-motd.d/05-service.j2
+++ b/roles/motd-role/templates/update-motd.d/05-service.j2
@@ -1,6 +1,6 @@
 #!/bin/sh
 # {{ ansible_managed }}
-echo "✨ {{ motd_role.name|capitalize }} a été déployé sur cette machine."
+echo "✨ {% if motd_role.verbose_name is defined %}{{ motd_role.verbose_name }}{% else %}{{ motd_role.name|capitalize }}{% endif %} a été déployé sur cette machine."
 {% if motd_role.path is defined %}
 echo "   Voir {{ motd_role.path }}"
 {% endif %}
diff --git a/roles/unifi-controller/tasks/main.yml b/roles/unifi-controller/tasks/main.yml
new file mode 100644
index 00000000..0ff14dda
--- /dev/null
+++ b/roles/unifi-controller/tasks/main.yml
@@ -0,0 +1,41 @@
+---
+# Install HTTPS support for APT
+- name: Install apt-transport-https
+  apt:
+    update_cache: true
+    name:
+      - apt-transport-https
+      - gpg
+      - dirmngr
+    state: present
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded
+
+# Add the key
+- name: Configure the apt key
+  apt_key:
+    keyserver: keyserver.ubuntu.com
+    id: 06E85760C0A52C50
+    state: present
+  register: apt_key_result
+  retries: 3
+  until: apt_key_result is succeeded
+  loop:
+
+# Add the repository into source list
+- name: Configure unifi repository
+  apt_repository:
+    repo: "{{ item }}"
+    state: present
+  loop:
+    - deb http://www.ui.com/downloads/unifi/debian stable ubiquiti
+
+- name: Install unifi
+  apt:
+    update_cache: true
+    name: unifi
+    state: present
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded