diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1b43708..5f1ede2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -123,7 +123,9 @@ jobs:
           build-args: |
             VCS_REF=${{ needs.metadata.outputs.vcs_ref }}
             BUILD_DATE=${{ needs.metadata.outputs.created_on }}
-          cache-from: type=local,src=${{ env.CACHE_PATH }}
+          cache-from: |
+            type=local,src=${{ env.CACHE_PATH }}
+            ghcr.io/cdalvaro/docker-salt-master:latest
           cache-to: type=local,dest=${{ env.CACHE_PATH }}
           push: true
           tags: ${{ needs.metadata.outputs.tags }}
diff --git a/assets/sbin/config-reloader b/assets/sbin/config-reloader
index adc3c47..fb393e2 100755
--- a/assets/sbin/config-reloader
+++ b/assets/sbin/config-reloader
@@ -13,7 +13,9 @@ function check_for_config_changes()
 
 while check_for_config_changes; do
   log_info "Configuration changes detected. Reloading salt-master ..."
+  supervisorctl stop salt-api
   supervisorctl stop salt-master
   killall salt-master; killall -9 salt-master
   supervisorctl start salt-master
+  supervisorctl start salt-api
 done
diff --git a/entrypoint.sh b/entrypoint.sh
index da2194d..67b2482 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,6 +16,8 @@ case "${1}" in
 
     case "${1}" in
       app:start)
+        salt-master --versions
+
         log_info "Starting supervisord ..."
         exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
         ;;
diff --git a/tests/lib/common.sh b/tests/lib/common.sh
index 581e6c7..73d655c 100644
--- a/tests/lib/common.sh
+++ b/tests/lib/common.sh
@@ -90,6 +90,7 @@ function start_container_and_wait()
 
   docker run --rm --detach --name "${CONTAINER_NAME}" \
   --publish 4505:4505 --publish 4506:4506 \
+  --env PUID="$(id -u)" --env PGID="$(id -g)" \
   --platform "${PLATFORM}" ${DOCKER_ARGS[@]} \
   "${IMAGE_NAME}" || return 1