diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 74c6839f1b..4ac4a87a00 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -32,7 +32,7 @@ jobs:
         # generate build matrix by checking out changes in anda/
         run: |
           # 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 )
+          changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u )
           echo "Changed folders: $changed_folders"
           # if changed_folders is empty then set is empty to true
           if [ -z "$changed_folders" ]; then
@@ -43,11 +43,6 @@ jobs:
           # turn it into a json array
           build_matrix=$(echo "$changed_folders" | jq -R . | jq -s . | jq -c .)
 
-          # if there's only one folder then check if it's
-
-          #build_matrix=$(ls anda/ | jq -R -s -c 'split("\n")[:-1]')
-          # create build matrix with { changed_folders: [ "folder1", "folder2" ] }
-
           echo "::set-output name=build_matrix::$build_matrix"
           #echo "::set-output name=build_matrix::$build_matrix"
   build:
@@ -70,10 +65,10 @@ jobs:
           sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
           sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
 
-      - uses: andaman-common-pkgs/anda-build@main
+      - uses: terrapkg/anda-build@main
         if: ${{ !fromJson(needs.manifest.outputs.is_empty) }}
         with:
-          name: "anda/${{ matrix.pkg }}/pkg"
+          name: "${{ matrix.pkg }}pkg"
           mockConfig: anda-37-${{ matrix.arch }}
           andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
 
diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index 3c475efba6..67bf1f0da7 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -26,7 +26,7 @@ jobs:
         # generate build matrix by checking out changes in anda/
         run: |
           # get the list of changed folders in the current commit
-          changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda/\K[^/]*' | sort -u )
+          changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u )
           echo "Changed folders: $changed_folders"
           # if changed_folders is empty then set is empty to true
           if [ -z "$changed_folders" ]; then
@@ -39,7 +39,7 @@ jobs:
 
           # if there's only one folder then check if it's
 
-          build_matrix=$(ls anda/ | jq -R -s -c 'split("\n")[:-1]')
+          build_matrix=$(find anda/ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u | jq -R -s -c 'split("\n")[:-1]')
           # create build matrix with { changed_folders: [ "folder1", "folder2" ] }
 
           echo "::set-output name=build_matrix::$build_matrix"
diff --git a/anda/moby-buildx/anda.hcl b/anda/moby-extras/moby-buildx/anda.hcl
similarity index 100%
rename from anda/moby-buildx/anda.hcl
rename to anda/moby-extras/moby-buildx/anda.hcl
diff --git a/anda/moby-buildx/moby-buildx.spec b/anda/moby-extras/moby-buildx/moby-buildx.spec
similarity index 100%
rename from anda/moby-buildx/moby-buildx.spec
rename to anda/moby-extras/moby-buildx/moby-buildx.spec
diff --git a/anda/moby-compose/anda.hcl b/anda/moby-extras/moby-compose/anda.hcl
similarity index 100%
rename from anda/moby-compose/anda.hcl
rename to anda/moby-extras/moby-compose/anda.hcl
diff --git a/anda/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec
similarity index 100%
rename from anda/moby-compose/moby-compose.spec
rename to anda/moby-extras/moby-compose/moby-compose.spec