diff --git a/entrypoint.sh b/entrypoint.sh
index d064c4e..d60e163 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,14 +1,14 @@
 #!/bin/bash -e
-# shellcheck disable=SC1091
 
 cd "$INPUT_WORKDIR"
 
 set -a
+# shellcheck disable=SC1091
 . ./.env
 set +a
 
 export K8S_NS;
-K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" \
+K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY//\//-}-$GITHUB_REF_NAME" \
     | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-' - \
     | sed 's/-\+/-/g; s/^-\+//; s/-$//')"
 
@@ -20,7 +20,7 @@ kubectl config set-context --current --namespace="$K8S_NS"
 if [ -n "$INPUT_REGISTRY_PASSWORD" ]; then
     kubectl get secret regcred \
         || kubectl create secret docker-registry regcred \
-            --docker-server="${REGISTRY}" \
+            --docker-server="$REGISTRY" \
             --docker-username="$INPUT_REGISTRY_USERNAME" \
             --docker-password="$INPUT_REGISTRY_PASSWORD"
 fi