diff --git a/Makefile b/Makefile
index e05840d..e0d25ec 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,11 @@ lint-workflow:
 
 build: pull-base-image
 	docker build -t $(IMAGE) .
-	cd build; ./gen-readme.sh $(IMAGE)
+	./build/gen-readme.sh $(IMAGE)
 
 rebuild: pull-base-image
 	docker build --no-cache -t $(IMAGE) .
-	cd build; ./gen-readme.sh $(IMAGE)
+	./build/gen-readme.sh $(IMAGE)
 
 
 # -------------------------------------------------------------------------------------------------
diff --git a/build/gen-readme.sh b/build/gen-readme.sh
index 6c9fe11..9229ba1 100755
--- a/build/gen-readme.sh
+++ b/build/gen-readme.sh
@@ -10,7 +10,7 @@ IMAGE="${1}"
 ###
 ### Retrieve information afterwards and Update README.md
 ###
-INFO="$( docker run -it --rm --entrypoint=httpd ${IMAGE} -V 2>&1 | tr -d "\r" )"
+INFO="$( docker run --rm --entrypoint=httpd "${IMAGE}" -V 2>&1 | tr -d '\r' )"
 
 echo "${INFO}"
 sed -i'' '/##[[:space:]]Version/q' "${CWD}/README.md"