Revert to no env

.github/workflows/build.yml

@@ -33,9 +33,6 @@ jobs:
       
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
-        env:
-          _BUILDAH_STARTED_IN_USERNS: ""
-          BUILDAH_ISOLATION: chroot
         uses: blue-build/github-action@v1.8
         with:
           recipe: ${{ matrix.recipe }}
@@ -47,4 +44,3 @@ jobs:
           # enabled by default, disable if your image is small and you want faster builds
           maximize_build_space: "true"
           rechunk: "true"
-          use_unstable_cli: "true"

recipes/components/cleanup-usr-etc.yml

@@ -0,0 +1,5 @@
+modules:
+  - type: script
+    snippets:
+      - "sudo cp -n -r /usr/etc /etc"
+      - "sudo rm -rf /usr/etc"

recipes/recipe.yml

@@ -17,6 +17,7 @@ modules:
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
   - from-file: components/chezmoi-module.yml
+  - from-file: components/cleanup-usr-etc.yml
 
   - type: signing