diff --git a/.gitignore b/.gitignore
index 243a86ca..23c635a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *.retry
 dist
 pvs
+__pycache__
+.idea
 openshift.local.clusterup/
 common-templates*.yaml
 releases.json
diff --git a/generate-templates.yaml b/generate-templates.yaml
index 05a17a9f..1c0260f4 100644
--- a/generate-templates.yaml
+++ b/generate-templates.yaml
@@ -32,7 +32,6 @@
     vars:
       os: rhel8
       icon: rhel
-      password: redhat
       oslabels: "{{ rhel8_labels }}"
       osinfoname: "{{ oslabels[0] }}"
 
@@ -60,7 +59,6 @@
     vars:
       os: rhel7
       icon: rhel
-      password: redhat
       oslabels: "{{ rhel7_labels }}"
       osinfoname: "{{ oslabels[0] }}"
 
@@ -84,7 +82,6 @@
     vars:
       os: rhel6
       icon: rhel
-      password: redhat
       oslabels: "{{ rhel6_labels }}"
       osinfoname: "{{ oslabels[0] }}"
 
@@ -104,7 +101,6 @@
     vars:
       os: centos8
       icon: centos
-      password: centos
       oslabels:
        - centos8
       osinfoname: "{{ oslabels[0] }}"
@@ -125,7 +121,6 @@
     vars:
       os: centos7
       icon: centos
-      password: centos
       oslabels:
        - centos7.0
       osinfoname: "{{ oslabels[0] }}"
@@ -146,7 +141,6 @@
     vars:
       os: centos6
       icon: centos
-      password: centos
       oslabels: "{{ centos6_labels }}"
       osinfoname: "{{ oslabels[0] }}"
 
@@ -174,7 +168,6 @@
     vars:
       os: fedora
       icon: fedora
-      password: fedora
       oslabels: "{{ fedora_labels }}"
       osinfoname: "{{ oslabels[0] }}"
 
@@ -190,7 +183,6 @@
     vars:
       os: opensuse
       icon: opensuse
-      password: opensuse
       oslabels:
        - opensuse15.0
       osinfoname: "{{ oslabels[0] }}"
@@ -208,7 +200,6 @@
     vars:
       os: ubuntu
       icon: ubuntu
-      password: ubuntu
       oslabels:
        - ubuntu18.04
       osinfoname: "{{ oslabels[0] }}"
diff --git a/templates/_linux.yaml b/templates/_linux.yaml
index 503f4816..6433ce8d 100644
--- a/templates/_linux.yaml
+++ b/templates/_linux.yaml
@@ -102,7 +102,7 @@ objects:
         - cloudInitNoCloud:
             userData: |-
               #cloud-config
-              password: {{ password }}
+              password: ${CLOUD_USER_PASSWORD}
               chpasswd: { expire: False }
           name: cloudinitdisk
 
@@ -120,3 +120,7 @@ parameters:
 - name: SRC_PVC_NAMESPACE
   description: Namespace of the source PVC
   value: kubevirt-os-images
+- description: Randomized password for cloud-user
+  from: '[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}'
+  generate: expression
+  name: CLOUD_USER_PASSWORD