diff --git a/builder.sh b/builder.sh
index cb3a34b..a619676 100755
--- a/builder.sh
+++ b/builder.sh
@@ -223,8 +223,8 @@ function run_build() {
     local release="${version}"
 
     # Overwrites
-    if bashio::var.has_value "${DOCKER_HUB}"; then repository="${DOCKER_HUB}"; fi
-    if bashio::var.has_value "${IMAGE}"; then image="${IMAGE}"; fi
+    if bashio::var.has_value "${DOCKER_HUB}"; then repository="${DOCKER_HUB@L}"; fi
+    if bashio::var.has_value "${IMAGE}"; then image="${IMAGE@L}"; fi
     if bashio::var.has_value "${RELEASE}"; then release="${RELEASE}"; fi
 
     # Replace {arch} with build arch for image
@@ -687,7 +687,7 @@ function extract_machine_build() {
         done
 
         for i in "${remove[@]}"; do
-            unset BUILD_MACHINE["$i"]
+            unset "${BUILD_MACHINE["$i"]}"
         done
     fi
 }