diff --git a/tasks/deb_CLI_packages.yml b/tasks/deb_CLI_packages.yml
index 8df32e5..b8a4fc0 100644
--- a/tasks/deb_CLI_packages.yml
+++ b/tasks/deb_CLI_packages.yml
@@ -24,6 +24,7 @@
     - iotop
     - glances
     - ranger
+    - rxvt-unicode-256color
 
 - name: Install extra CLI packages
   apt:
diff --git a/tasks/docker.yml b/tasks/docker.yml
index 920d259..d87e853 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -21,6 +21,20 @@
     url: curl -fsSL https://download.docker.com/linux/debian/gpg
     id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
     state: present
+  register: add_repository_key
+  ignore_errors: "{{ docker_apt_ignore_key_error }}"
+
+- name: Ensure curl is present (on older systems without SNI).
+  apt: 
+    - name: curl
+      state: present
+  when: add_repository_key is failed
+
+- name: Add Docker apt key (alternative for older systems without SNI).
+  shell: "curl -sSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -"
+  args:
+    warn: no
+  when: add_repository_key is failed
 
 - name: Add Docker repository.
   apt_repository: