diff --git a/.gitea/workflows/build-image.yaml b/.gitea/workflows/build-image.yaml
index 760304f..314cf75 100644
--- a/.gitea/workflows/build-image.yaml
+++ b/.gitea/workflows/build-image.yaml
@@ -1,8 +1,10 @@
 name: build-image
 
+# Only a release tag builds images: a full build takes ~25 min on the runner,
+# too costly to repeat on every push to main. Recipes are still linted and
+# validated on every push by ci.yml.
 on:
   push:
-    branches: [main]
     tags: ["v*.*.*"]
 
 # Builds raw disk images of the two default-tier editions (see
@@ -85,16 +87,6 @@ jobs:
           ./build-image.sh --dish "$dish" --root-size ${{ matrix.root_size }}
           xz -T0 "build/$dish.img"
 
-      - name: Upload image and kickstart as artifact
-        if: github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.edition }}
-          path: |
-            build/${{ env.DISH }}.img.xz
-            cook/dishes/${{ env.DISH }}.cfg
-          if-no-files-found: error
-
       - name: Publish image and kickstart as release
         if: startsWith(github.ref, 'refs/tags/')
         uses: https://git.phyllo.me/devops/action-gh-release@v2
diff --git a/cook/ingredients/core/locale.ks b/cook/ingredients/core/locale.ks
index 7ae59e6..b9f7191 100644
--- a/cook/ingredients/core/locale.ks
+++ b/cook/ingredients/core/locale.ks
@@ -1,5 +1,5 @@
 # Keyboard, language, and timezone configuration
 
-keyboard --xlayouts='ch (fr)' # Set keyboard layouts for Romandy
+keyboard --vckeymap=ch-fr --xlayouts='ch (fr)' # Set keyboard layouts for Romandy: --vckeymap for the text console (tty login, headless), --xlayouts for graphical sessions
 lang en_US.UTF-8 # Set system language to American English. More languages could be supported: --addsupport=cs_CZ,de_DE,en_UK
 timezone Europe/Zurich --utc # Set system timezone to Zurich
diff --git a/cook/ingredients/core/network.ks b/cook/ingredients/core/network.ks
index 5c14534..f86f58e 100644
--- a/cook/ingredients/core/network.ks
+++ b/cook/ingredients/core/network.ks
@@ -1,3 +1,3 @@
 # Network configuration
 
-network  --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network devices, enable them at boot time device and sets a particular hostname. "link" selects the first device reaching an up state
+network  --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllomeos # Configure network devices, enable them at boot time device and sets a generic hostname (rename per machine after install). "link" selects the first device reaching an up state