diff --git a/Dockerfile b/Dockerfile
index 65083ed..a1e9b51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 #   2. `fuse`      - enable mounting `/ipns/` & `/ipfs/`, and file system level interactions
 
 # IPFS version to be built
-ARG VERSION=v0.5.1
+ARG VERSION=v0.6.0
 
 # Target CPU archtecture of built IPFS binary
 ARG ARCH
@@ -132,7 +132,7 @@ RUN TEST_NO_FUSE=1  make test_short
 
 #
 ## These stages pick up whichever test level was selected, and produce
-#       the desired flavor if the final, compressed binary at `/go/src/cmd/ipfs/ipfs`
+#       the desired flavor of the final, compressed binary at `/go/src/cmd/ipfs/ipfs`
 #
 FROM test-${TEST_LEVEL} AS build-fuse
 RUN make build
diff --git a/scripts/ci-create-manifest.sh b/scripts/ci-create-manifest.sh
index 4531960..9384b00 100755
--- a/scripts/ci-create-manifest.sh
+++ b/scripts/ci-create-manifest.sh
@@ -5,23 +5,25 @@ set -eo pipefail
 SLUG=$1
 VERSION=$2
 FLAVOR=$3
-SHORT_VERSION=${4:-${VERSION}}
+SHORT_VERSION=${4:-$VERSION}
 
-BASE="${SLUG}:${VERSION}-${FLAVOR}"
+BASE="$SLUG:$VERSION-$FLAVOR"
 
-IMAGE_AMD64="${BASE}-amd64"
-IMAGE_ARM64="${BASE}-arm64"
-IMAGE_ARM6="${BASE}-arm32v6"
-IMAGE_ARM7="${BASE}-arm32v7"
+IMAGE_AMD64="$BASE-amd64"
+IMAGE_ARM32v6="$BASE-arm32v6"
+IMAGE_ARM32v7="$BASE-arm32v7"
+IMAGE_ARM64v8="$BASE-arm64v8"
 
-MANIFEST="${SLUG}:${SHORT_VERSION}"
+MANIFEST="$SLUG:$SHORT_VERSION"
 
 echo "Creating ${MANIFEST}…"
 
-docker -D manifest create "${MANIFEST}"  "${IMAGE_AMD64}"  "${IMAGE_ARM64}"  "${IMAGE_ARM6}"  "${IMAGE_ARM7}"
-docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM64}"  --os linux  --arch arm64 --variant v8
-docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM7}"   --os linux  --arch arm   --variant v7
-docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM6}"   --os linux  --arch arm   --variant v6
-docker manifest push      "${MANIFEST}"
+docker -D manifest create "$MANIFEST"  "$IMAGE_AMD64"  "$IMAGE_ARM32v6"  "$IMAGE_ARM32v7"  "$IMAGE_ARM64v8"
+docker manifest annotate  "$MANIFEST"  "$IMAGE_ARM32v6"  --os linux  --arch arm   --variant v6
+docker manifest annotate  "$MANIFEST"  "$IMAGE_ARM32v7"  --os linux  --arch arm   --variant v7
+docker manifest annotate  "$MANIFEST"  "$IMAGE_ARM64v8"  --os linux  --arch arm64 --variant v8
+docker manifest push      "$MANIFEST"
+
+docker manifest inspect   "$MANIFEST" | jq '.'
 
 echo