diff --git a/Dockerfile b/Dockerfile
index 2524c758b9d22f92e26663dbbf4b2e7ef8fcb90d..eafac57b02dd0dae2b0f0314f1e29eb372d9625c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,7 @@ RUN npm install
 COPY assets /app/assets
 RUN npm run build
 
-FROM alpine:3.7
-WORKDIR /
+FROM alpine
 COPY --from=go_builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=go_builder /go/src/app/app /app
 COPY templates /templates
diff --git a/main.go b/main.go
index 99a396bc363cc3e76241874decd895bbe57e7a76..2532e7e8872debe556387a9d7e723010fbeedbd3 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,7 @@ func NewConfigFromEnv() Config {
 }
 
 func formatTemplate(w http.ResponseWriter, templateName string, data interface{}) error {
-	pageTemplate, err := template.ParseFiles(fmt.Sprintf("templates/%s", templateName))
+	pageTemplate, err := template.ParseFiles(fmt.Sprintf("templates/%s.html", templateName))
 	if err != nil {
 		return err
 	}