diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 6e5040dec0..74c6839f1b 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -31,7 +31,7 @@ jobs:
         id: generate_build_matrix
         # generate build matrix by checking out changes in anda/
         run: |
-          # get the list of changed folders in the current commit
+          # get the list of changed folders in the current commit, including subfolders
           changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda/\K[^/]*' | sort -u )
           echo "Changed folders: $changed_folders"
           # if changed_folders is empty then set is empty to true
diff --git a/anda/moby-extras/moby-buildx/anda.hcl b/anda/moby-buildx/anda.hcl
similarity index 100%
rename from anda/moby-extras/moby-buildx/anda.hcl
rename to anda/moby-buildx/anda.hcl
diff --git a/anda/moby-extras/moby-buildx/moby-buildx.spec b/anda/moby-buildx/moby-buildx.spec
similarity index 100%
rename from anda/moby-extras/moby-buildx/moby-buildx.spec
rename to anda/moby-buildx/moby-buildx.spec
diff --git a/anda/moby-extras/moby-compose/anda.hcl b/anda/moby-compose/anda.hcl
similarity index 100%
rename from anda/moby-extras/moby-compose/anda.hcl
rename to anda/moby-compose/anda.hcl
diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-compose/moby-compose.spec
similarity index 100%
rename from anda/moby-extras/moby-compose/moby-compose.spec
rename to anda/moby-compose/moby-compose.spec