diff --git a/cloudmock/aws/mockec2/tags.go b/cloudmock/aws/mockec2/tags.go
index 4814627238..f2fdc915f1 100644
--- a/cloudmock/aws/mockec2/tags.go
+++ b/cloudmock/aws/mockec2/tags.go
@@ -27,9 +27,11 @@ import (
 	"github.com/golang/glog"
 )
 
-// Not (yet?) in aws-sdk-go
-const ResourceTypeNatGateway = "nat-gateway"
-const ResourceTypeAddress = "elastic-ip"
+const (
+	// Not (yet?) in aws-sdk-go
+	ResourceTypeNatGateway = "nat-gateway"
+	ResourceTypeAddress    = "elastic-ip"
+)
 
 func (m *MockEC2) CreateTagsRequest(*ec2.CreateTagsInput) (*request.Request, *ec2.CreateTagsOutput) {
 	panic("Not implemented")
diff --git a/dns-controller/pkg/watchers/annotations.go b/dns-controller/pkg/watchers/annotations.go
index 1dcf8a8a6a..22bd6acc58 100644
--- a/dns-controller/pkg/watchers/annotations.go
+++ b/dns-controller/pkg/watchers/annotations.go
@@ -16,10 +16,12 @@ limitations under the License.
 
 package watchers
 
-// AnnotationNameDNSExternal is used to set up a DNS name for accessing the resource from outside the cluster
-// For a service of Type=LoadBalancer, it would map to the external LB hostname or IP
-const AnnotationNameDNSExternal = "dns.alpha.kubernetes.io/external"
+const (
+	// AnnotationNameDNSExternal is used to set up a DNS name for accessing the resource from outside the cluster
+	// For a service of Type=LoadBalancer, it would map to the external LB hostname or IP
+	AnnotationNameDNSExternal = "dns.alpha.kubernetes.io/external"
 
-// AnnotationNameDNSInternal is used to set up a DNS name for accessing the resource from inside the cluster
-// This is only supported on Pods currently, and maps to the Internal address
-const AnnotationNameDNSInternal = "dns.alpha.kubernetes.io/internal"
+	// AnnotationNameDNSInternal is used to set up a DNS name for accessing the resource from inside the cluster
+	// This is only supported on Pods currently, and maps to the Internal address
+	AnnotationNameDNSInternal = "dns.alpha.kubernetes.io/internal"
+)
diff --git a/nodeup/pkg/model/cloudconfig.go b/nodeup/pkg/model/cloudconfig.go
index 3003d0c53e..bf35433052 100644
--- a/nodeup/pkg/model/cloudconfig.go
+++ b/nodeup/pkg/model/cloudconfig.go
@@ -29,13 +29,15 @@ import (
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
 )
 
-const CloudConfigFilePath = "/etc/kubernetes/cloud.config"
+const (
+	CloudConfigFilePath = "/etc/kubernetes/cloud.config"
 
-// Required for vSphere CloudProvider
-const MinimumVersionForVMUUID = "1.5.3"
+	// Required for vSphere CloudProvider
+	MinimumVersionForVMUUID = "1.5.3"
 
-// VM UUID is set by cloud-init
-const VM_UUID_FILE_PATH = "/etc/vmware/vm_uuid"
+	// VM UUID is set by cloud-init
+	VM_UUID_FILE_PATH = "/etc/vmware/vm_uuid"
+)
 
 // CloudConfigBuilder creates the cloud configuration file
 type CloudConfigBuilder struct {