diff --git a/appdaemon/appdaemon.yaml b/appdaemon/appdaemon.yaml
index c979b64e..c8ca86b3 100644
--- a/appdaemon/appdaemon.yaml
+++ b/appdaemon/appdaemon.yaml
@@ -1,5 +1,5 @@
 ---
-secrets: /config/secrets.yaml
+secrets: /homeassistant/secrets.yaml
 appdaemon:
   latitude: 52.0
   longitude: 4.0
diff --git a/appdaemon/apps-theme.yaml b/appdaemon/apps-theme.yaml
index 75f9cc60..5d0e9600 100644
--- a/appdaemon/apps-theme.yaml
+++ b/appdaemon/apps-theme.yaml
@@ -7,7 +7,7 @@ nspanel-1:
     panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend"
     screensaver:
       entity: weather.k3ll3r
-      theme: !include /config/appdaemon/apps/screensaver-theme.yaml
+      theme: !include /config/apps/screensaver-theme.yaml
         #background:       [220, 0, 0]
         #time:             [220, 0, 255]
         #timeAMPM:         [220, 0, 255]
@@ -53,4 +53,4 @@ nspanel-1:
     cards:
       - type: cardEntities
         entities:
-          - entity: switch.example_item
\ No newline at end of file
+          - entity: switch.example_item
diff --git a/appdaemon/screensaver-theme-include/apps.yaml b/appdaemon/screensaver-theme-include/apps.yaml
index dadd1545..2a54d0aa 100644
--- a/appdaemon/screensaver-theme-include/apps.yaml
+++ b/appdaemon/screensaver-theme-include/apps.yaml
@@ -8,8 +8,8 @@ nspanel-1:
     updateMode: "auto-notify"
     screensaver:
       entity: weather.k3ll3r
-      theme: !include /config/appdaemon/apps/screensaver-theme.yaml
+      theme: !include /config/apps/screensaver-theme.yaml
     cards:
       - type: cardEntities
         entities:
-          - entity: switch.example_item
\ No newline at end of file
+          - entity: switch.example_item
diff --git a/docs/configure_mqtt.md b/docs/configure_mqtt.md
index eff6e414..04881f06 100644
--- a/docs/configure_mqtt.md
+++ b/docs/configure_mqtt.md
@@ -22,17 +22,16 @@ The configuration has been moved out of the config folder from homeassistant. Th
 
 For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml` Restart your AppDaemon Container (not HomeAssistant) after adding the MQTT Configuration.
 
-You will find this file in the following location: `/addon_configs/a0d7b954_appdaemon/appdeamon.yaml`
+You will find this file in the following location: `/addon_configs/a0d7b954_appdaemon/appdaemon.yaml` (if using Home Assistant Addon)
 
 ```yaml
 ---
-secrets: /homeassistant/secrets.yaml
+secrets: /homeassistant/secrets.yaml # !!! Note this has changed for AppDaemon Addon >= v 0.15.0
 appdaemon:
   latitude: 52.0
   longitude: 4.0
   elevation: 2
   time_zone: Europe/Berlin
-  app_dir: /homeassistant/appdaemon/apps/ # !!! This is really important for AppDaemon HA Addon >= 15
   plugins:
     HASS:
       type: hass
@@ -52,10 +51,16 @@ admin:
 api:
 hadashboard:
 ```
+If you are migrating from AppDaemon Addon < v 0.15.0, your configuration folders should have been automatically moved by the addon. However, if it wasn't or if you prefer to have your configuration files stored elsewhere include the following yaml:
+
+```yaml
+appdaemon:
+  app_dir: /homeassistant/appdaemon/apps/ # !!! This would point to /config/appdaemon/apps in your Home Assistant instance.
+```
 
 # Configure NsPanel on AppDaemon
 
-Please add the following minimal configuration to your apps.yaml, which is located in `config/appdaemon/apps/apps.yaml`
+Please add the following minimal configuration to your apps.yaml, which is located in `/addon_configs/a0d7b954_appdaemon/apps/apps.yaml` (if using Home Assistant Addon).
 
 Note: You need to move your `apps.yaml` to this location if it isn't there.
 
diff --git a/docs/faq.md b/docs/faq.md
index 1556709e..d36ea73c 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -32,6 +32,18 @@ Please don't modify the Full Topic in your Tasmota Config, unless you know the i
     - the appdaemon log, after restarting the container
   
 
+## This isn't working since AppDaemon v0.15.x
+
+There has been an upstream change made to AppDaemon which changes where the configuration files are stored.
+
+You may need to change your yaml files to reflect this:
+
+filename | Home Assistant Share | Docker Container Location 
+-- | -- | -- 
+appdaemon.yaml | /addon_configs/a0d7b954_appdaemon/appdaemon.yaml | /config/appdaemon.yaml  
+apps.yaml | /addon_configs/a0d7b954_appdaemon/apps/apps.yaml | /config/apps/apps.yaml 
+secrets.yaml | /config/secrets.yaml | /homeassistant/secrets.yaml
+
 ## How to update
 
 ### Update AppDaemon Script