diff --git a/Makefile b/Makefile
index 641ba69d10..bddd07e0b9 100644
--- a/Makefile
+++ b/Makefile
@@ -151,10 +151,10 @@ notary-dockerfile:
 	@docker build --rm --force-rm -t notary .
 
 server-dockerfile:
-	@docker build --rm --force-rm -f Dockerfile.server -t notary-server .
+	@docker build --rm --force-rm -f server.Dockerfile -t notary-server .
 
 signer-dockerfile:
-	@docker build --rm --force-rm -f Dockerfile.signer -t notary-signer .
+	@docker build --rm --force-rm -f signer.Dockerfile -t notary-signer .
 
 docker-images: notary-dockerfile server-dockerfile signer-dockerfile
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 5bd578c214..17b5798fa2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 notaryserver:
   build: .
-  dockerfile: Dockerfile.server
+  dockerfile: server.Dockerfile
   links:
    - notarymysql
    - notarysigner
@@ -15,7 +15,7 @@ notarysigner:
    - /dev/bus/usb/003/010:/dev/bus/usb/002/010
    - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm
   build: .
-  dockerfile: Dockerfile.signer
+  dockerfile: signer.Dockerfile
   links:
    - notarymysql
   command: -config=fixtures/signer-config.json
diff --git a/Dockerfile.server b/server.Dockerfile
similarity index 100%
rename from Dockerfile.server
rename to server.Dockerfile
diff --git a/Dockerfile.signer b/signer.Dockerfile
similarity index 100%
rename from Dockerfile.signer
rename to signer.Dockerfile