diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index bd9b716..2cb9e67 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -23,4 +23,4 @@ jobs:
       - uses: ./.github/actions/release-variant
         with:
           variant: go
-          archs: amd64,aarch64,armv7
+          archs: amd64,arm64
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index b34ac5a..8394f37 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -23,4 +23,4 @@ jobs:
       - uses: ./.github/actions/release-variant
         with:
           variant: js
-          archs: amd64,aarch64,armv7
+          archs: amd64,arm64
diff --git a/.github/workflows/py.yml b/.github/workflows/py.yml
index 85df8db..8f17341 100644
--- a/.github/workflows/py.yml
+++ b/.github/workflows/py.yml
@@ -23,4 +23,4 @@ jobs:
       - uses: ./.github/actions/release-variant
         with:
           variant: py
-          archs: amd64,aarch64,armv7
+          archs: amd64,arm64
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 1649b15..0360ce7 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -23,4 +23,4 @@ jobs:
       - uses: ./.github/actions/release-variant
         with:
           variant: ruby
-          archs: amd64,aarch64,armv7
+          archs: amd64,arm64
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4efad56..f84ccc3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -23,4 +23,4 @@ jobs:
       - uses: ./.github/actions/release-variant
         with:
           variant: rust
-          archs: amd64,aarch64,armv7
+          archs: amd64,arm64
diff --git a/README.md b/README.md
index aabc334..78ec83f 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Requirements:
 - [`docker`](https://docs.docker.com/get-docker/)
 - [`cosign`](https://docs.sigstore.dev/cosign/installation/)
 
-Note: these steps should also work without `docker` on an apk-based Linux distribution such as [Alpine](https://www.alpinelinux.org/).
+Note: these steps should also work without `docker`, but you may need to install [bubblewrap](https://github.com/containers/bubblewrap) to run Melange builds.
 
 ### Change directory
 
@@ -75,8 +75,8 @@ Build an apk for all architectures using melange:
 ```
 docker run --rm --privileged -v "${PWD}":/work  \
     --entrypoint=melange --workdir=/work \
-    cgr.dev/chainguard/sdk build melange.yaml \
-    --arch amd64,aarch64,armv7 \
+    ghcr.io/wolfi-dev/sdk build melange.yaml \
+    --arch amd64,arm64 \
     --signing-key melange.rsa
 ```
 
@@ -84,11 +84,11 @@ To debug the above:
 ```
 docker run --rm --privileged -it -v "${PWD}":/work \
     --entrypoint sh \
-    cgr.dev/chainguard/sdk
+    ghcr.io/wolfi-dev/sdk
 
 # Build apks (use just --arch amd64 to isolate issue)
 melange build melange.yaml \
-    --arch amd64,aarch64,armv7 \
+    --arch amd64,arm64 \
     --signing-key melange.rsa
 
 # Install an apk
@@ -111,7 +111,7 @@ REF="ghcr.io/${GITHUB_USERNAME}/hello-melange-apko/$(basename "${PWD}")"
 docker run --rm -v "${PWD}":/work \
     --entrypoint=apko --workdir=/work ghcr.io/wolfi-dev/sdk build --debug apko.yaml \
     "${REF}" output.tar -k melange.rsa.pub \
-    --arch amd64,aarch64,armv7
+    --arch amd64,arm64
 ```
 
 If you do not wish to push the image, you could load it directly:
@@ -131,7 +131,7 @@ docker run --rm -it -v "${PWD}":/work \
     --workdir=/work ghcr.io/wolfi-dev/sdk
 
 # Build image (use just --arch amd64 to isolate issue)
-apko build --debug apko.yaml "${REF}" output.tar -k melange.rsa.pub --arch amd64,aarch64,armv7
+apko build --debug apko.yaml "${REF}" output.tar -k melange.rsa.pub --arch amd64,arm64
 ```
 
 ## Push image with apko
@@ -155,7 +155,7 @@ docker run --rm -v "${PWD}":/work \
             apko login ghcr.io -u "${GITHUB_USERNAME}" --password-stdin && \
             apko publish --debug apko.yaml \
                 "${REF}" -k melange.rsa.pub \
-                --arch amd64,aarch64,armv7'
+                --arch amd64,arm64'
 ```
 
 ## Sign image with cosign
diff --git a/go/apko.yaml b/go/apko.yaml
index 441e951..a41539e 100644
--- a/go/apko.yaml
+++ b/go/apko.yaml
@@ -1,9 +1,11 @@
 contents:
   repositories:
-    - https://dl-cdn.alpinelinux.org/alpine/edge/main
+    - https://packages.wolfi.dev/os
     - /work/packages
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - alpine-baselayout-data
+    - wolfi-baselayout
     - hello-server
 accounts:
   groups:
diff --git a/go/melange.yaml b/go/melange.yaml
index 0925b29..1247cec 100644
--- a/go/melange.yaml
+++ b/go/melange.yaml
@@ -12,10 +12,11 @@ package:
 environment:
   contents:
     repositories:
-      - https://dl-cdn.alpinelinux.org/alpine/edge/main
-      - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/os
+    keyring:
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout-data
+      - wolfi-baselayout
       - ca-certificates-bundle
       - busybox
       - go
diff --git a/js/apko.yaml b/js/apko.yaml
index 441e951..a41539e 100644
--- a/js/apko.yaml
+++ b/js/apko.yaml
@@ -1,9 +1,11 @@
 contents:
   repositories:
-    - https://dl-cdn.alpinelinux.org/alpine/edge/main
+    - https://packages.wolfi.dev/os
     - /work/packages
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - alpine-baselayout-data
+    - wolfi-baselayout
     - hello-server
 accounts:
   groups:
diff --git a/js/melange.yaml b/js/melange.yaml
index 4c9febc..fa431dc 100644
--- a/js/melange.yaml
+++ b/js/melange.yaml
@@ -15,10 +15,11 @@ package:
 environment:
   contents:
     repositories:
-      - https://dl-cdn.alpinelinux.org/alpine/edge/main
-      - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/os
+    keyring:
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout-data
+      - wolfi-baselayout
       - ca-certificates-bundle
       - busybox
       - nodejs
diff --git a/py/apko.yaml b/py/apko.yaml
index 441e951..a41539e 100644
--- a/py/apko.yaml
+++ b/py/apko.yaml
@@ -1,9 +1,11 @@
 contents:
   repositories:
-    - https://dl-cdn.alpinelinux.org/alpine/edge/main
+    - https://packages.wolfi.dev/os
     - /work/packages
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - alpine-baselayout-data
+    - wolfi-baselayout
     - hello-server
 accounts:
   groups:
diff --git a/py/melange.yaml b/py/melange.yaml
index dde2b89..830cc51 100644
--- a/py/melange.yaml
+++ b/py/melange.yaml
@@ -15,10 +15,11 @@ package:
 environment:
   contents:
     repositories:
-      - https://dl-cdn.alpinelinux.org/alpine/edge/main
-      - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/os
+    keyring:
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout-data
+      - wolfi-baselayout
       - ca-certificates-bundle
       - busybox
       - gcc
diff --git a/ruby/apko.yaml b/ruby/apko.yaml
index 441e951..4522ea7 100644
--- a/ruby/apko.yaml
+++ b/ruby/apko.yaml
@@ -1,9 +1,11 @@
 contents:
   repositories:
-    - https://dl-cdn.alpinelinux.org/alpine/edge/main
+    - https://packages.wolfi.dev/os
     - /work/packages
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - alpine-baselayout-data
+    - wofli-baselayout
     - hello-server
 accounts:
   groups:
diff --git a/ruby/melange.yaml b/ruby/melange.yaml
index 36f3e75..0abed8e 100644
--- a/ruby/melange.yaml
+++ b/ruby/melange.yaml
@@ -15,10 +15,11 @@ package:
 environment:
   contents:
     repositories:
-      - https://dl-cdn.alpinelinux.org/alpine/edge/main
-      - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/os
+    keyring:
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout-data
+      - wolfi-baselayout
       - ca-certificates-bundle
       - busybox
       - make
diff --git a/rust/apko.yaml b/rust/apko.yaml
index 441e951..a41539e 100644
--- a/rust/apko.yaml
+++ b/rust/apko.yaml
@@ -1,9 +1,11 @@
 contents:
   repositories:
-    - https://dl-cdn.alpinelinux.org/alpine/edge/main
+    - https://packages.wolfi.dev/os
     - /work/packages
+  keyring:
+    - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - alpine-baselayout-data
+    - wolfi-baselayout
     - hello-server
 accounts:
   groups:
diff --git a/rust/melange.yaml b/rust/melange.yaml
index a47a804..03992b2 100644
--- a/rust/melange.yaml
+++ b/rust/melange.yaml
@@ -12,10 +12,11 @@ package:
 environment:
   contents:
     repositories:
-      - https://dl-cdn.alpinelinux.org/alpine/edge/main
-      - https://dl-cdn.alpinelinux.org/alpine/edge/community
+      - https://packages.wolfi.dev/os
+    keyring:
+      - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
     packages:
-      - alpine-baselayout-data
+      - wolfi-baselayout
       - ca-certificates-bundle
       - busybox
       - cargo