diff --git a/roles/network_plugin/calico/templates/calico-config.yml.j2 b/roles/network_plugin/calico/templates/calico-config.yml.j2
index 1e87917ea71..12951ce6f0d 100644
--- a/roles/network_plugin/calico/templates/calico-config.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-config.yml.j2
@@ -56,12 +56,8 @@ data:
           {% else %}
             "ipam": {
               "type": "calico-ipam",
-            {% if ipv4_stack %}
-              "assign_ipv4": "true"{{ ',' if (ipv6_stack and ipv4_stack) }}
-            {% endif %}
-            {% if ipv6_stack %}
-              "assign_ipv6": "true"
-            {% endif %}
+              "assign_ipv4": "{{ ipv4_stack | to_json }}",
+              "assign_ipv6": "{{ ipv6_stack | to_json }}"
             },
           {% endif %}
           {% if calico_allow_ip_forwarding %}
diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index ad3eefc40b4..31b8c156c65 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -259,6 +259,10 @@ spec:
             # no effect. This should fall within `--cluster-cidr`.
             # - name: CALICO_IPV4POOL_CIDR
             #   value: "192.168.0.0/16"
+{% if not ipv4_stack %}
+            - name: CALICO_IPV4POOL_CIDR
+              value: "none"
+{% endif %}
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ calico_ipv4pool_ipip }}"
             # Enable or Disable VXLAN on the default IP pool.