diff --git a/roles/os_net_setup/templates/subnet_command.j2 b/roles/os_net_setup/templates/subnet_command.j2
index 731cbeac5a..4e1e513a63 100644
--- a/roles/os_net_setup/templates/subnet_command.j2
+++ b/roles/os_net_setup/templates/subnet_command.j2
@@ -47,17 +47,16 @@ oc exec -n {{ cifmw_os_net_setup_namespace }} openstackclient -- openstack subne
     --host-routes destination={{ hr.destination }},gateway={{ hr.nexthop }} \
 {%              endfor %}
 {%          endif %}
-{%          if subnet_args.ip_version is defined and
-           subnet_args.ip_version | int == 6 %}
+{%          if subnet_args.ip_version is defined %}
     --ip-version {{subnet_args.ip_version }} \
 {%          endif %}
 {%          if subnet_args.ipv6_address_mode is defined and
                subnet_args.ipv6_address_mode in ipv6_modes_arguments %}
-    --ipv6-address-mode {{subnet_args.provider_physical_network }} \
+    --ipv6-address-mode {{subnet_args.ipv6_address_mode }} \
 {%          endif %}
 {%          if subnet_args.ipv6_ra_mode is defined and
            subnet_args.ipv6_ra_mode in ipv6_modes_arguments %}
-    --ipv6-ra-mode {{subnet_args.provider_physical_network }} \
+    --ipv6-ra-mode {{subnet_args.ipv6_ra_mode }} \
 {%          endif %}
 {%          if (subnet_args.is_dhcp_enabled is defined and
                not subnet_args.is_dhcp_enabled) or