diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7adc1956..2573c537 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -72,7 +72,7 @@ jobs:
         name: Save builds
         uses: actions/upload-artifact@v4
         with:
-          name: docker
-          path: build/*
+          name: docker_builds
+          path: docker-compose/build/*
           compression-level: 9
           if-no-files-found: error
diff --git a/.github/workflows/k8s.yml b/.github/workflows/k8s.yml
index 88212849..17c3b72a 100644
--- a/.github/workflows/k8s.yml
+++ b/.github/workflows/k8s.yml
@@ -29,24 +29,38 @@ jobs:
       - name: mkdir
         run: mkdir ./build
       - name: Debug version
-        run: kubectl version --client=true --output=json | tee ./build/kubectl_version.json
+        run: kubectl version --client=true --output=json
       - id: bake-local
         name: Bake manifest of local
         #uses: azure/k8s-bake@v3
         run: kubectl kustomize ./k8s/live/local/ -o build/k8s-local.yml
+      - id: upload-artifact-local
+        name: Save build local
+        uses: actions/upload-artifact@v4
+        with:
+          name: k8s-local.yml
+          path: build/k8s-local.yml
+          compression-level: 0
+          if-no-files-found: error
       - id: bake-azure-dev
         name: Bake manifest of azure-dev
         run: kubectl kustomize ./k8s/live/azure-dev/ -o build/k8s-azure-dev.yml
+      - id: upload-artifacts
+        name: Save build azure-dev
+        uses: actions/upload-artifact@v4
+        with:
+          name: azure-dev.yml
+          path: build/k8s-azure-dev.yml
+          compression-level: 0
+          if-no-files-found: error
       - id: bake-azure-integ
         name: Bake manifest of azure-integ
         run: kubectl kustomize ./k8s/live/azure-integ/ -o build/k8s-azure-integ.yml
       - id: upload-artifacts
-        name: Save builds
+        name: Save build integ
         uses: actions/upload-artifact@v4
         with:
-          name: kustomize
-          path: |
-            build/kubectl_version.json
-            build/k8s-*.yml
-          compression-level: 9
+          name: azure-integ.yml
+          path: build/k8s-azure-integ.yml
+          compression-level: 0
           if-no-files-found: error