diff --git a/build-and-push/action.yaml b/build-and-push/action.yaml
index d0a8e3d..a55f5ec 100644
--- a/build-and-push/action.yaml
+++ b/build-and-push/action.yaml
@@ -150,6 +150,8 @@ runs:
         # supports multi-arch. Also never set DOCKER_HOST (it overrides the
         # active context).
         unset DOCKER_HOST || true
+        BUILDER_HOST=$(printf '%s' "${BUILDER_HOST}" | tr -d '\r')
+        BUILDER_USER=$(printf '%s' "${BUILDER_USER}" | tr -d '\r')
 
         docker context rm -f remote-builder 2>/dev/null || true
         docker context create remote-builder \