diff --git a/.github/workflows/release-wasi-demo-app.yml b/.github/workflows/release-wasi-demo-app.yml
index 043d35ccf..0b16ee4f0 100644
--- a/.github/workflows/release-wasi-demo-app.yml
+++ b/.github/workflows/release-wasi-demo-app.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  IMAGES: "wasi-demo-app wasi-demo-oci wasi-demo-oci-artifact wasi-http"
+  IMAGES: "wasi-demo-app wasi-demo-oci wasi-demo-oci-artifact wasi-demo-http"
 
 jobs:
   release-wasi-demo:
@@ -28,7 +28,7 @@ jobs:
       wasi_demo_app: ${{ steps.get_digests.outputs.wasi_demo_app }}
       wasi_demo_oci: ${{ steps.get_digests.outputs.wasi_demo_oci }}
       wasi_demo_oci_artifact: ${{ steps.get_digests.outputs.wasi_demo_oci_artifact }}
-      wasi_http: ${{ steps.get_digests.outputs.wasi_http }}
+      wasi_demo_http: ${{ steps.get_digests.outputs.wasi_demo_http }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-env
@@ -94,7 +94,7 @@ jobs:
       - release-wasi-demo
     strategy:
       matrix:
-        image: ["wasi_demo_app", "wasi_demo_oci", "wasi_demo_oci_artifact", "wasi_http"]
+        image: ["wasi_demo_app", "wasi_demo_oci", "wasi_demo_oci_artifact", "wasi_demo_http"]
     uses: ./.github/workflows/sign.yml
     with:
       image-name: ${{ matrix.image }}
@@ -106,7 +106,7 @@ jobs:
       - release-wasi-demo
     strategy:
       matrix:
-        image: ["wasi_demo_app", "wasi_demo_oci", "wasi_demo_oci_artifact", "wasi_http"]
+        image: ["wasi_demo_app", "wasi_demo_oci", "wasi_demo_oci_artifact", "wasi_demo_http"]
     uses: ./.github/workflows/sbom.yml
     with:
       image-name: ${{ matrix.image }}
diff --git a/Makefile b/Makefile
index 2d99f979c..f6c38eb40 100644
--- a/Makefile
+++ b/Makefile
@@ -220,21 +220,12 @@ dist/img-oci-artifact.tar: target/wasm32-wasip1/$(OPT_PROFILE)/img-oci-artifact.
 	@mkdir -p "dist/"
 	cp "$<" "$@"
 
-.PHONY: pull pull-app pull-oci pull-oci-artifact pull-http
+.PHONY: pull pull-%
 pull: pull-app pull-oci pull-oci-artifact pull-http
 	echo "Pulled all images"
 
-pull-app:
-	sudo ctr image pull ghcr.io/containerd/runwasi/wasi-demo-app:latest
-
-pull-oci:
-	sudo ctr image pull ghcr.io/containerd/runwasi/wasi-demo-oci:latest
-
-pull-oci-artifact:
-	sudo ctr image pull ghcr.io/containerd/runwasi/wasi-demo-oci-artifact:latest
-
-pull-http:
-	sudo ctr image pull ghcr.io/containerd/runwasi/wasi-http:latest
+pull-%:
+	sudo ctr image pull ghcr.io/containerd/runwasi/wasi-demo-$*:latest
 
 docker/load: dist/img.tar
 	docker load -i $<
@@ -260,7 +251,7 @@ target/wasm32-wasip1/$(OPT_PROFILE)/img-oci-artifact.tar: target/wasm32-wasip1/$
 dist/http-img-oci.tar: crates/containerd-shim-wasm-test-modules/src/modules/hello_wasi_http.wasm
 	@mkdir -p "dist/"
 	cargo run --bin oci-tar-builder -- \
-		--name wasi-http \
+		--name wasi-demo-http \
 		--repo ghcr.io/containerd/runwasi \
 		--tag latest \
 		--module $< \
diff --git a/crates/containerd-shim-wasmtime/README.md b/crates/containerd-shim-wasmtime/README.md
index ab953fe3a..ce39f7e47 100644
--- a/crates/containerd-shim-wasmtime/README.md
+++ b/crates/containerd-shim-wasmtime/README.md
@@ -51,7 +51,7 @@ Use `oci-tar-builder` to create an OCI image with our `http-handler`. Assuming o
 
 ```shell
 cargo run --bin oci-tar-builder -- \
-    --name wasi-http \
+    --name wasi-demo-http \
     --repo ghcr.io/containerd/runwasi \
     --tag latest --module wasi-http.wasm \
     -o ./dist/wasi-http-img-oci.tar
@@ -67,7 +67,7 @@ make pull-http
 
 ```shell
 sudo ctr run --rm --net-host --runtime=io.containerd.wasmtime.v1 \
-    ghcr.io/containerd/runwasi/wasi-http:latest wasi-http /wasi-http.wasm
+    ghcr.io/containerd/runwasi/wasi-demo-http:latest wasi-http /wasi-http.wasm
 ```
 
 - Finally, assuming our handler will respond to `GET` requests at `/`, we can