diff --git a/defaults/main.yml b/defaults/main.yml
index c6e46f3..5f334ca 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -102,8 +102,8 @@ haproxy_ssl_letsencrypt_acl:
     backend_name: letsencrypt
 
 # hatop extra package URL and checksum
-haproxy_hatop_download_url: "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hatop/hatop-0.7.7.tar.gz"
-haproxy_hatop_download_checksum: "sha256:0b9fc1b84ce4e469a069e3a3c7c1b5eea10e6bb24bc66bd32af453acd54636ab"
+haproxy_hatop_download_url: "https://github.com/jhunt/hatop/archive/v0.8.0.tar.gz"
+haproxy_hatop_download_checksum: "sha256:bcdab1664358ec83027957df11bbeb322df1a96d414a3ccc4e211532b82c4ad2"
 
 # Where the extra package download is executed from.
 # Options are ['deployment-host', 'target-host']
diff --git a/tasks/haproxy_install.yml b/tasks/haproxy_install.yml
index 7ada113..4a78d43 100644
--- a/tasks/haproxy_install.yml
+++ b/tasks/haproxy_install.yml
@@ -26,15 +26,16 @@
 
 - name: Ensure haproxy_hatop_download_path exists
   file:
-    path: "{{ haproxy_hatop_download_path }}"
+    path: "{{ haproxy_hatop_download_path }}/{{ haproxy_hatop_download_url | basename | replace('.tar.gz', '') }}"
     state: directory
   delegate_to: "{{ (haproxy_hatop_downloader == 'deployment-host') | ternary('localhost', inventory_hostname) }}"
 
 - name: Download extra package
   get_url:
     url: "{{ haproxy_hatop_download_url }}"
-    dest: "{{ haproxy_hatop_download_path }}"
+    dest: "{{ haproxy_hatop_download_path }}/{{ haproxy_hatop_download_url | basename }}"
     validate_certs: "{{ haproxy_hatop_download_validate_certs }}"
+    checksum: "{{ haproxy_hatop_download_checksum }}"
   register: fetch_url
   until: fetch_url is success
   retries: 3
@@ -45,12 +46,14 @@
   unarchive:
     src: "{{ haproxy_hatop_download_path }}/{{ haproxy_hatop_download_url | basename }}"
     remote_src: "{{ (haproxy_hatop_downloader == 'deployment-host') | ternary('no', 'yes') }}"
-    dest: "/opt"
+    dest: "{{ haproxy_hatop_download_path }}/{{ haproxy_hatop_download_url | basename | replace('.tar.gz', '') }}"
+    extra_opts:
+      - --strip-components=1
 
 - name: Install HATop
   command: "install -m 755 bin/hatop /usr/local/bin"
   args:
-    chdir: "/opt/{{ haproxy_hatop_download_url | basename | replace('.tar.gz', '') }}"
+    chdir: "{{ haproxy_hatop_download_path }}/{{ haproxy_hatop_download_url | basename | replace('.tar.gz', '') }}"
     creates: "/usr/local/bin/hatop"
 
 - include_tasks: haproxy_apparmor.yml