diff --git a/aws-cli/docker-bake.hcl b/aws-cli/docker-bake.hcl
index 4d16d83..20b4875 100644
--- a/aws-cli/docker-bake.hcl
+++ b/aws-cli/docker-bake.hcl
@@ -17,7 +17,7 @@ variable "LOCAL_PLATFORM" {
 
 target "_common" {
   args = {
-    AWS_CLI_VERSION = ${VERSION}
+    AWS_CLI_VERSION = "${VERSION}"
   }
   dockerfile = "Containerfile"
   tags = [
@@ -39,6 +39,6 @@ target "default" {
     "org.opencontainers.image.source" = "https://github.com/polymathrobotics/oci"
     "org.opencontainers.image.licenses" = "Apache-2.0"
     "org.opencontainers.image.description" = "AWS command-line interface."
-    "org.opencontainers.image.title" = "aws-cli"
+    "org.opencontainers.image.title" = "${IMAGE_NAME}"
   }
 }