diff --git a/entrypoint.sh b/entrypoint.sh
index 76dce5e..02697db 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,13 +7,13 @@ mkdir -p "$DOCKER_CONFIG"
 [ -f .env ] && . ./.env
 
 if [ -z "$IMAGEAPP" ]; then
-    REGISTRY="$(echo "$GITHUB_SERVER_URL" | sed 's .*://  ')"
-    IMAGEAPP="$REGISTRY/$INPUT_IMAGE"
+    IMAGEAPP="${GITHUB_SERVER_URL#*://}/$INPUT_IMAGE"
 fi
 
 if [ "$INPUT_CACHE" = true ]; then
-    set -- --import-cache "type=registry,ref=$IMAGEAPP/cache" \
-           --export-cache "type=registry,ref=$IMAGEAPP/cache"
+    IMAGECACHE="${IMAGEAPP%:*}/cache"
+    set -- --import-cache "type=registry,ref=$IMAGECACHE" \
+           --export-cache "type=registry,ref=$IMAGECACHE"
 fi
 
 cat <<EOF > "$DOCKER_CONFIG/config.json"