diff --git a/README.md b/README.md
index 1d74b449..dc8e114e 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ Ansible config and a bunch of Docker containers.
 * eBook management with calibre-web
 * A dual panel local file manager
 
-
 ### Docker Containers Used
 
 * [Airsonic](https://airsonic.github.io/) - catalog and stream music
diff --git a/nas.yml b/nas.yml
index a5145b4b..e6ec6725 100644
--- a/nas.yml
+++ b/nas.yml
@@ -172,6 +172,10 @@
     when: (mosquitto_enabled | default(False))
     tags: mosquitto
 
+  - import_tasks: tasks/cloudcmd.yml
+    when: (cloudcmd_enabled | default(False))
+    tags: cloudcmd
+
   - import_tasks: tasks/calibre.yml
     when: (calibre_enabled | default(False))
     tags: calibre
@@ -190,4 +194,5 @@
 
   - import_tasks: tasks/cloudcmd.yml
     when: (cloudcmd_enabled | default(False))
-    tags: cloudcmd
\ No newline at end of file
+    tags: cloudcmd
+    tags: homeassistant
diff --git a/templates/traefik/traefik.toml b/templates/traefik/traefik.toml
index 99d3f70a..4027a3ec 100644
--- a/templates/traefik/traefik.toml
+++ b/templates/traefik/traefik.toml
@@ -182,8 +182,8 @@ onDemand = false # create certificate when container is created
   sans = ["airsonic.{{ ansible_nas_domain }}",
           "bazarr.{{ ansible_nas_domain }}",
           "bitwarden.{{ ansible_nas_domain }}",
-          "cloudcmd.{{ ansible_nas_domain }}",
           "calibre.{{ ansible_nas_domain }}",
+          "cloudcmd.{{ ansible_nas_domain }}",
           "couchpotato.{{ ansible_nas_domain }}",
           "duplicati.{{ ansible_nas_domain }}",
           "emby.{{ ansible_nas_domain }}",