diff --git a/ansible/roles-infra/infra-openshift-cnv-create-inventory/tasks/create_inventory.yaml b/ansible/roles-infra/infra-openshift-cnv-create-inventory/tasks/create_inventory.yaml
index a90d49f8f4b..46b37161120 100644
--- a/ansible/roles-infra/infra-openshift-cnv-create-inventory/tasks/create_inventory.yaml
+++ b/ansible/roles-infra/infra-openshift-cnv-create-inventory/tasks/create_inventory.yaml
@@ -42,7 +42,7 @@
         sessionAffinity: None
         type: NodePort
   register: r_expose_bastion
-  when: local_bastion|default(False)
+  when: local_bastion is defined
   until: r_expose_bastion is success
   retries: "{{ openshift_cnv_retries }}"
   delay: "{{ openshift_cnv_delay }}"
diff --git a/ansible/roles-infra/infra-openshift-cnv-resources/tasks/create_network.yaml b/ansible/roles-infra/infra-openshift-cnv-resources/tasks/create_network.yaml
index ad3cd84a92f..2d12884b170 100644
--- a/ansible/roles-infra/infra-openshift-cnv-resources/tasks/create_network.yaml
+++ b/ansible/roles-infra/infra-openshift-cnv-resources/tasks/create_network.yaml
@@ -10,7 +10,13 @@
       spec:
         config: "{{ config | to_json }}"
   vars:
-    config: "{'cniVersion':'0.3.1','type':'ovn-k8s-cni-overlay','topology':'layer2','name': '{{ _network.name }}{{ guid }}', 'netAttachDefName': '{{ openshift_cnv_namespace }}/{{ _network.name }}{{ guid }}', 'mtu': {{ _network.mtu | default(1500) }}}"
+    config:
+      cniVersion: "0.3.1"
+      type: "ovn-k8s-cni-overlay"
+      topology: "layer2"
+      name: "{{ _network.name }}{{ guid }}"
+      netAttachDefName: "{{ openshift_cnv_namespace }}/{{ _network.name }}{{ guid }}"
+      mtu: "{{ _network.mtu | default(1500) | int }}"
   register: r_createnetwork
   until: r_createnetwork is success
   retries: "{{ openshift_cnv_retries }}"