diff --git a/core-arch.yaml b/core-arch.yaml
index bf114df..1bafaff 100644
--- a/core-arch.yaml
+++ b/core-arch.yaml
@@ -38,13 +38,24 @@ stages:
   - module: exec
     inputs:
       - |
-        git clone --revision 346d411d52acffdb7d259ec3516f0eb093b97a62 --depth 1 https://git.ruds.io/rs2009/akshara /akshara
+        git clone --revision 8e7e5cb576d751539e5e61a2801e098db2873ffd --depth 1 https://git.ruds.io/rs2009/akshara /akshara
         cd /akshara
         cp -a usr/lib/akshara /usr/lib/akshara
         cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
         cp usr/bin/akshara /usr/bin/akshara
       - rm -rf /akshara
 
+post-stages:
+  - module: exec
+    inputs:
+      - locale-gen
+      - rm -f /boot/* &>/dev/null
+        pushd /usr/lib/modules
+        kernels=(*)
+        popd
+        cp /usr/lib/modules/"${kernels[0]}"/vmlinuz /boot/vmlinuz-"${kernels[0]}"
+      - dracut --force --regenerate-all
+
 override:
   - path: /var/lib/pacman/
     keep: new
@@ -63,7 +74,7 @@ auto-update:
   enabled: false
 
 distro-config:
-  before-stages: |
+  initialise: |
     set -e
 
     mkdir -p /var/cache/blendOS/pacman/pkg
@@ -112,16 +123,5 @@ distro-config:
     cp /etc/locale.gen ./etc
     cp /etc/locale.conf ./etc
 
-  after-stages: |
+  finalise: |
     umount -l ./var/cache/blendOS
-
-    systemd-nspawn -D . locale-gen
-
-    rm -f ./boot/* &>/dev/null
-
-    pushd ./usr/lib/modules
-    kernels=(*)
-    popd
-    cp ./usr/lib/modules/"${kernels[0]}"/vmlinuz ./boot/vmlinuz-"${kernels[0]}"
-
-    systemd-nspawn -D . dracut --force --regenerate-all
diff --git a/container-image.yaml b/oci.yaml
similarity index 90%
rename from container-image.yaml
rename to oci.yaml
index 5a4c925..240438b 100644
--- a/container-image.yaml
+++ b/oci.yaml
@@ -20,7 +20,7 @@ auto-update:
   interval: 3600
 
 distro-config:
-  before-stages: |
+  initialise: |
     set -e
 
     mkdir -p /var/cache/blendOS/container/blobs
@@ -50,10 +50,8 @@ distro-config:
     cp /etc/locale.gen ./etc
     cp /etc/locale.conf ./etc
 
-  after-stages: |
+  finalise: |
     umount -l ./var/cache/blendOS &>/dev/null
-    systemd-nspawn -D . locale-gen &>/dev/null
-    systemd-nspawn -D . dracut --force --regenerate-all
 
 env:
   IMAGE_NAME: ""
diff --git a/ubuntu.yaml b/ubuntu.yaml
index 84bcb31..053cd96 100644
--- a/ubuntu.yaml
+++ b/ubuntu.yaml
@@ -1,4 +1,4 @@
-track: "https://git.ruds.io/rs2009/blendOS-tracks/raw/branch/main/container-image.yaml"
+track: "https://git.ruds.io/rs2009/blendOS-tracks/raw/branch/main/oci.yaml"
 
 stages:
   - module: exec
@@ -6,4 +6,4 @@ stages:
       - apt-get install -yq hello
 
 env:
-  IMAGE_NAME: docker.io/library/ubuntu:rolling
+  IMAGE_NAME: docker://docker.io/library/ubuntu:rolling