diff --git a/README.md b/README.md
index df14f39..c198562 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Works, as long as there is access to `docker` CLI.
 
-In my workflows, it is being run in the `alpine` linux with `git`, `bash` and `docker-cli` packages installed (see [actions/alpine](https://git.dzuchun.ing/actions/alpine)). Official `docker:cli` image should work too.
+In my workflows, it is being run in the `alpine` linux with `git`, `bash` and `docker-cli` packages installed (see [actions/docker](https://git.dzuchun.ing/actions/docker)). Official `docker:cli` image should work too.
 
 ## License
 
diff --git a/main.sh b/main.sh
index 8693e38..ec9fc7c 100755
--- a/main.sh
+++ b/main.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
+set -eu -o pipefail
 
 REGISTRY_URL=$(printenv INPUT_REGISTRY-URL)
 USER=$(printenv INPUT_REGISTRY-USER)
 IMAGE=$(printenv INPUT_IMAGE-NAME)
 # fallback to registry variable
-IMAGE=${IMAGE:-$FORGEJO_REGISTRY}
+IMAGE=${IMAGE:-$FORGEJO_REPOSITORY}
 TAG="$INPUT_TAG"
 TOKEN="$INPUT_TOKEN"
 CONTEXT="$GITHUB_WORKSPACE/$INPUT_CONTEXT"
@@ -22,7 +23,7 @@ echo "Building the image, tag=$IMAGE_TAG"
 docker build --compress --tag $IMAGE_TAG $CONTEXT
 
 # log in the registry
-printenv $TOKEN | docker login -u $USER --password-stdin $REGISTRY_URL
+echo $TOKEN | docker login -u $USER --password-stdin $REGISTRY_URL
 
 # push the image
 docker push $IMAGE_TAG