diff --git a/Dockerfile b/Dockerfile
index a84b0faa1..ac6d261f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ COPY database ./database
 COPY source ./source
 
 ENV DATABASES="postgres mysql redshift cassandra spanner cockroachdb clickhouse"
-ENV SOURCES="file go-bindata github aws-s3 google-cloud-storage"
+ENV SOURCES="file go_bindata github aws_s3 google_cloud_storage"
 
 RUN go build -a -o build/migrate.linux-386 -ldflags="-X main.Version=${VERSION}" -tags "$DATABASES $SOURCES" ./cli
 
diff --git a/Makefile b/Makefile
index 13e774618..841a074d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SOURCE ?= file go-bindata github aws-s3 google-cloud-storage
+SOURCE ?= file go_bindata github aws_s3 google_cloud_storage
 DATABASE ?= postgres mysql redshift cassandra spanner cockroachdb clickhouse
 VERSION ?= $(shell git describe --tags 2>/dev/null | cut -c 2-)
 TEST_FLAGS ?=
diff --git a/cli/build_aws-s3.go b/cli/build_aws-s3.go
index 85c6cc43b..a9671a6bf 100644
--- a/cli/build_aws-s3.go
+++ b/cli/build_aws-s3.go
@@ -1,4 +1,4 @@
-// +build aws-s3
+// +build aws_s3
 
 package main
 
diff --git a/cli/build_go-bindata.go b/cli/build_go-bindata.go
index 68149280f..362e023a6 100644
--- a/cli/build_go-bindata.go
+++ b/cli/build_go-bindata.go
@@ -1,4 +1,4 @@
-// +build go-bindata
+// +build go_bindata
 
 package main
 
diff --git a/cli/build_google-cloud-storage.go b/cli/build_google-cloud-storage.go
index 39c2384e3..8f62f5913 100644
--- a/cli/build_google-cloud-storage.go
+++ b/cli/build_google-cloud-storage.go
@@ -1,4 +1,4 @@
-// +build google-cloud-storage
+// +build google_cloud_storage
 
 package main