diff --git a/tasks/caddy-install.yml b/tasks/caddy-install.yml
index e0365ed..e1c9757 100644
--- a/tasks/caddy-install.yml
+++ b/tasks/caddy-install.yml
@@ -1,11 +1,6 @@
 ---
 # Server/Caddyserver-Install: Install/Update Caddy Webserver (with some modules)
 
-# Detect some more host facts
-- name: caddyserver - Detect debian distributor ID
-  shell: lsb_release -is
-  register: lsb_id
-
 - name: caddyserver - Create cache directory
   file:
     path: "{{ caddy_cachedir }}"
@@ -29,12 +24,17 @@
       get_url:
         url: "https://caddyserver.com/download/linux/amd64?plugins=http.ratelimit&license=personal"
         dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz"
-      when: lsb_id.stdout != "Raspbian"
-    - name: caddyserver - Download caddy webserver (raspberry pi)
+      when: ansible_architecture == "x86_64"
+    - name: caddyserver - Download caddy webserver (armv7/ raspberry pi)
       get_url:
         url: "https://caddyserver.com/download/linux/arm7?plugins=http.ratelimit&license=personal"
         dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz"
-      when: lsb_id.stdout == "Raspbian"
+      when: ansible_architecture == "armv7l"
+    - name: caddyserver - Download caddy webserver (arm64)
+      get_url:
+        url: "https://caddyserver.com/download/linux/arm64?plugins=http.ratelimit&license=personal"
+        dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz"
+      when: ansible_architecture == "aarch64"
 
     - name: caddyserver - Stop caddy
       become: yes