diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 594066b..f2239b7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,7 +77,7 @@ jobs:
         run: tar -xvf components.tar -C lib
       - name: Get interface version
         id: interface_version
-        run: echo "VERSION=$( wasm-tools component wit lib/interface.wasm --json | jq -r '.packages[0].name' | cut -d'@' -f2 )" >> $GITHUB_OUTPUT
+        run: echo "VERSION=$( wasm-tools component wit lib/interface.wasm --json | jq -r '[.packages[] | select(.name | contains("${GITHUB_REPOSITORY/\//:}@"))][0].name' | cut -d'@' -f2 )" >> $GITHUB_OUTPUT
       - name: Get tag version
         if: startsWith(github.ref, 'refs/tags/')
         id: tag_version
diff --git a/Makefile b/Makefile
index 181c18d..c6397c5 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ wit/deps: wkg.toml $(shell find wit -type f -name "*.wit" -not -path "deps")
 components/wit/deps: wit/deps components/wkg.toml $(shell find components/wit -type f -name "*.wit" -not -path "deps")
 	( cd components && wkg fetch )
 
-.PHONY: publish
-publish: $(shell find lib -type f -name "*.wasm" | sed -e 's:^lib/:publish-:g')
+.PHONY: publish ## Publish each component in the lib directory
+publish: $(shell find lib -maxdepth 1 -type f -name "*.wasm" | sed -e 's:^lib/:publish-:g')
 
 .PHONY: publish-%
 publish-%: