diff --git a/ci-job-validation.groovy b/ci-job-validation.groovy
index f4ca0d8be..890701251 100644
--- a/ci-job-validation.groovy
+++ b/ci-job-validation.groovy
@@ -17,7 +17,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it
diff --git a/containerized-tests.groovy b/containerized-tests.groovy
index 059bc5568..dbeb02db2 100644
--- a/containerized-tests.groovy
+++ b/containerized-tests.groovy
@@ -18,7 +18,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it
diff --git a/k8s-e2e-external-storage.groovy b/k8s-e2e-external-storage.groovy
index b10ce4d54..acf34ad1d 100644
--- a/k8s-e2e-external-storage.groovy
+++ b/k8s-e2e-external-storage.groovy
@@ -17,7 +17,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it
diff --git a/mini-e2e-helm.groovy b/mini-e2e-helm.groovy
index 0ae8a2acf..a660d69b2 100644
--- a/mini-e2e-helm.groovy
+++ b/mini-e2e-helm.groovy
@@ -19,7 +19,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it
diff --git a/mini-e2e.groovy b/mini-e2e.groovy
index 8b6396689..61455bdf9 100644
--- a/mini-e2e.groovy
+++ b/mini-e2e.groovy
@@ -16,7 +16,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it
diff --git a/upgrade-tests.groovy b/upgrade-tests.groovy
index c1dffab53..781a0845b 100644
--- a/upgrade-tests.groovy
+++ b/upgrade-tests.groovy
@@ -16,7 +16,7 @@ def ssh(cmd) {
 }
 
 def podman_login(registry, username, passwd) {
-	ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
+	ssh "podman login --authfile=~/.podman-auth.json --username='${username}' --password='${passwd}' ${registry}"
 }
 
 // podman_pull pulls image from the source (CI internal) registry, and tags it