diff --git a/docker/build.sh b/docker/build.sh
index 976e7d4..7e0df11 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -117,9 +117,8 @@ function build {
   if [[ ! -z "${BORINGSSL}" ]]; then
     flags+=("--ssl-provider boringssl")
     flags+=("--boringssl ${BORINGSSL}")
-  else
-    flags+=("--openssl   ${OPENSSL}")
   fi
+  flags+=("--openssl ${OPENSSL}")
 
   local after=()
 
diff --git a/gojira.sh b/gojira.sh
index 4a46ab5..ef72461 100755
--- a/gojira.sh
+++ b/gojira.sh
@@ -563,7 +563,7 @@ function image_name {
     RESTY_EVENTS=${RESTY_EVENTS:-$(req_find $req_file RESTY_EVENTS_VERSION)}
     BORINGSSL=${BORINGSSL:-$(req_find $req_file RESTY_BORINGSSL_VERSION)}
     KONG_NGX_MODULE=${KONG_NGX_MODULE:-$(req_find $req_file KONG_NGINX_MODULE_BRANCH)}
-    KONG_BUILD_TOOLS=${KONG_BUILD_TOOLS_BRANCH:-$(req_find $req_file KONG_BUILD_TOOLS_BRANCH)}
+    KONG_BUILD_TOOLS=${KONG_BUILD_TOOLS_BRANCH:-$(req_find $req_file KONG_BUILD_TOOLS)}
     KONG_GO_PLUGINSERVER=${KONG_GO_PLUGINSERVER_VERSION:-$(req_find $req_file KONG_GO_PLUGINSERVER_VERSION)}
     KONG_LIBGMP=${GMP_VERSION:-$(req_find $req_file KONG_GMP_VERSION)}
     KONG_LIBNETTLE=${NETTLE_VERSION:-$(req_find $req_file KONG_DEP_NETTLE_VERSION)}