diff --git a/templates/calico.go b/templates/calico.go
index 840a3adc..57ea497a 100644
--- a/templates/calico.go
+++ b/templates/calico.go
@@ -469,7 +469,7 @@ metadata:
   namespace: kube-system
 
 
-{{if ne .CloudProvider ""}}
+{{if ne .CloudProvider "none"}}
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -477,7 +477,7 @@ metadata:
   name: {{.CloudProvider}}-ippool
   namespace: kube-system
 data:
-  aws-ippool: |-
+  {{.CloudProvider}}-ippool: |-
     apiVersion: v1
     kind: ipPool
     metadata: