diff --git a/servapps/HomeAssistant/cosmos-compose.json b/servapps/HomeAssistant/cosmos-compose.json
index 5a3df000..0ea82bd0 100644
--- a/servapps/HomeAssistant/cosmos-compose.json
+++ b/servapps/HomeAssistant/cosmos-compose.json
@@ -82,12 +82,20 @@
           "type": "volume"
         }
       ],
-      "post_install": [
-        "wget --directory-prefix \"/config/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/configuration.yaml",
-        "wget --directory-prefix \"/config/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/automations.yaml",
-        "wget --directory-prefix \"/config/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scenes.yaml",
-        "wget --directory-prefix \"/config/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scripts.yaml"
-      ],
+      {if Context.useFileBrowser}
+      "depends_on": {
+        "{ServiceName}-Filebrowser": {
+          "condition": "service_healthy"
+        }
+      },
+      {/if}
+      {if Context.useCodeServer}
+      "depends_on": {
+        "{ServiceName}-Code": {
+          "condition": "service_healthy"
+        }
+      },
+      {/if}
       "routes": [
         {
           "name": "{ServiceName}",
@@ -138,6 +146,12 @@
           "type": "volume"
         }        
       ],
+      "post_install": [
+        "wget --directory-prefix \"/workspace/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/configuration.yaml",
+        "wget --directory-prefix \"/workspace/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/automations.yaml",
+        "wget --directory-prefix \"/workspace/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scenes.yaml",
+        "wget --directory-prefix \"/workspace/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scripts.yaml"
+      ],
       "routes": [
         {
           "name": "{ServiceName}-Code",
@@ -202,6 +216,12 @@
           "type": "volume"
         }
       ],
+      "post_install": [
+        "wget --directory-prefix \"/srv/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/configuration.yaml",
+        "wget --directory-prefix \"/srv/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/automations.yaml",
+        "wget --directory-prefix \"/srv/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scenes.yaml",
+        "wget --directory-prefix \"/srv/\" http://aseracorp.github.io/resiSTORE/servapps/HomeAssistant/artefacts/scripts.yaml"
+      ],
       "routes": [
         {
           "name": "{ServiceName}-Filebrowser",
diff --git a/servapps/Scada-LTS/cosmos-compose.json b/servapps/Scada-LTS/cosmos-compose.json
index 4a777c75..ab9652ff 100644
--- a/servapps/Scada-LTS/cosmos-compose.json
+++ b/servapps/Scada-LTS/cosmos-compose.json
@@ -12,8 +12,7 @@
       "command": "/usr/bin/wait-for-it --host=database --port=3306 --timeout=30 --strict -- /usr/local/tomcat/bin/catalina.sh run",
       "depends_on": {
         "{ServiceName}-db": {
-          "condition": "service_healthy",
-          "restart": "true"
+          "condition": "service_healthy"
         }
       },
       "security_opt": [