diff --git a/Dockerfile b/Dockerfile
index 08c67187da..44ec6dd0e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.4.2-cross
+FROM golang:1.5.1
 
 RUN apt-get update && apt-get install -y \
 	libltdl-dev \
diff --git a/notary-server-Dockerfile b/Dockerfile.server
similarity index 97%
rename from notary-server-Dockerfile
rename to Dockerfile.server
index f18b885391..439517c79e 100644
--- a/notary-server-Dockerfile
+++ b/Dockerfile.server
@@ -1,4 +1,4 @@
-FROM golang
+FROM golang:1.5.1
 
 RUN apt-get update && apt-get install -y \
     libltdl-dev \
diff --git a/notary-signer-Dockerfile b/Dockerfile.signer
similarity index 96%
rename from notary-signer-Dockerfile
rename to Dockerfile.signer
index 23b74d46dd..e94cbc1b82 100644
--- a/notary-signer-Dockerfile
+++ b/Dockerfile.signer
@@ -9,8 +9,7 @@ ENV NOTARY_SIGNER_DEFAULT_ALIAS="timestamp_1"
 ENV NOTARY_SIGNER_TIMESTAMP_1="testpassword"
 
 # Install openSC and dependencies
-RUN apt-get update && \
-    apt-get install -y \
+RUN apt-get update && apt-get install -y \
     libltdl-dev \
     libpcsclite-dev \
     opensc \
diff --git a/Makefile b/Makefile
index 70a46f7001..942b9ba410 100644
--- a/Makefile
+++ b/Makefile
@@ -126,10 +126,10 @@ notary-dockerfile:
 	@docker build --rm --force-rm -t notary .
 
 server-dockerfile:
-	@docker build --rm --force-rm -f notary-server-Dockerfile -t notary-server .
+	@docker build --rm --force-rm -f Dockerfile.server -t notary-server .
 
 signer-dockerfile:
-	@docker build --rm --force-rm -f notary-signer-Dockerfile -t notary-signer .
+	@docker build --rm --force-rm -f Dockerfile.signer -t notary-signer .
 
 docker-images: notary-dockerfile server-dockerfile signer-dockerfile
 
diff --git a/docker-compose.yml b/docker-compose.yml
index be90b9c533..00e9471285 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 notaryserver:
   build: .
-  dockerfile: notary-server-Dockerfile
+  dockerfile: Dockerfile.server
   links:
    - notarymysql
    - notarysigner
@@ -14,7 +14,7 @@ notarysigner:
    - /dev/bus/usb/003/010:/dev/bus/usb/002/010
    - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm
   build: .
-  dockerfile: notary-signer-Dockerfile
+  dockerfile: Dockerfile.signer
   links:
    - notarymysql
 notarymysql: