diff --git a/cmd/web-api/Dockerfile b/cmd/web-api/Dockerfile
index c3d0c79..aa37f33 100644
--- a/cmd/web-api/Dockerfile
+++ b/cmd/web-api/Dockerfile
@@ -1,3 +1,8 @@
+# To manully execute build locally use:
+#   docker build -f cmd/web-api/Dockerfile  --build-arg name=web-api .
+# This uses a multi-stage docker file. You can use target to build a specific stage.
+#   docker build -f cmd/web-api/Dockerfile  --build-arg name=web-api --target dev .
+
 FROM golang:1.13.5-alpine3.11 AS build_base_golang
 
 LABEL maintainer="lee@geeksinthewoods.com"
@@ -60,20 +65,21 @@ COPY internal ./internal
 
 # Copy cmd specific packages.
 COPY ${code_path} ${code_path}
-COPY ${code_path}/templates /templates
-#COPY ${code_path}/static /static
+COPY ${code_path}/templates /build/templates
+#COPY ${code_path}/static /build/static
 
 # Copy the global templates.
-ADD resources/templates/shared /templates/shared
-ADD configs/fresh-auto-reload.conf /runner.conf
+ADD resources/templates/shared /build/templates/shared
+ADD configs/fresh-auto-reload.conf /build/runner.conf
 
-ENV TEMPLATE_DIR=/templates
-ENV SHARED_TEMPLATE_DIR=/templates/shared
-#ENV STATIC_DIR=/static
+# These need to be relative paths for Hot reloads to work with docker-compose.
+ENV TEMPLATE_DIR=./templates
+ENV SHARED_TEMPLATE_DIR=../../resources/templates/shared
+#ENV STATIC_DIR=./static
 
 WORKDIR ${code_path}
 
-ENTRYPOINT ["fresh", "-c", "/runner.conf"]
+ENTRYPOINT ["fresh", "-c", "/build/runner.conf"]
 
 FROM dev AS builder
 
@@ -88,9 +94,7 @@ FROM alpine:3.11
 RUN apk --update --no-cache add \
             tzdata ca-certificates curl openssl
 
-COPY --from=builder /gosrv /
-#COPY --from=builder /static /static
-COPY --from=builder /templates /templates
+COPY --from=builder /build /
 
 ENV TEMPLATE_DIR=/templates
 ENV SHARED_TEMPLATE_DIR=/templates/shared
diff --git a/cmd/web-app/Dockerfile b/cmd/web-app/Dockerfile
index c931c4d..ecb2101 100644
--- a/cmd/web-app/Dockerfile
+++ b/cmd/web-app/Dockerfile
@@ -1,3 +1,8 @@
+# To manully execute build locally use:
+#   docker build -f cmd/web-app/Dockerfile  --build-arg name=web-app .
+# This uses a multi-stage docker file. You can use target to build a specific stage.
+#   docker build -f cmd/web-app/Dockerfile  --build-arg name=web-app --target dev .
+
 FROM golang:1.13.5-alpine3.11 AS build_base_golang
 
 LABEL maintainer="lee@geeksinthewoods.com"
@@ -39,20 +44,21 @@ COPY internal ./internal
 
 # Copy cmd specific packages.
 COPY ${code_path} ${code_path}
-COPY ${code_path}/templates /templates
-COPY ${code_path}/static /static
+COPY ${code_path}/templates /build/templates
+COPY ${code_path}/static /build/static
 
 # Copy the global templates.
-ADD resources/templates/shared /templates/shared
-ADD configs/fresh-auto-reload.conf /runner.conf
+ADD resources/templates/shared /build/templates/shared
+ADD configs/fresh-auto-reload.conf /build/runner.conf
 
-ENV TEMPLATE_DIR=/templates
-ENV SHARED_TEMPLATE_DIR=/templates/shared
-ENV STATIC_DIR=/static
+# These need to be relative paths for Hot reloads to work with docker-compose.
+ENV TEMPLATE_DIR=./templates
+ENV SHARED_TEMPLATE_DIR=../../resources/templates/shared
+ENV STATIC_DIR=./static
 
 WORKDIR ${code_path}
 
-ENTRYPOINT ["fresh", "-c", "/runner.conf"]
+ENTRYPOINT ["fresh", "-c", "/build/runner.conf"]
 
 FROM dev AS builder
 
@@ -63,9 +69,7 @@ FROM alpine:3.11
 RUN apk --update --no-cache add \
             tzdata ca-certificates curl openssl
 
-COPY --from=builder /gosrv /
-COPY --from=builder /static /static
-COPY --from=builder /templates /templates
+COPY --from=builder /build /
 
 ENV TEMPLATE_DIR=/templates
 ENV SHARED_TEMPLATE_DIR=/templates/shared
diff --git a/cmd/web-app/templates/content/site-index.gohtml b/cmd/web-app/templates/content/site-index.gohtml
index d71ccce..2555169 100644
--- a/cmd/web-app/templates/content/site-index.gohtml
+++ b/cmd/web-app/templates/content/site-index.gohtml
@@ -4,7 +4,6 @@
 
 {{end}}
 {{ define "content" }}
-
         <div id="myCarousel" class="carousel slide" data-ride="carousel">
             <ol class="carousel-indicators">
                 <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
diff --git a/configs/fresh-auto-reload.conf b/configs/fresh-auto-reload.conf
index 9cc8cd6..3b54e66 100644
--- a/configs/fresh-auto-reload.conf
+++ b/configs/fresh-auto-reload.conf
@@ -1,5 +1,5 @@
 root:              .
-tmp_path:          ./tmp
+tmp_path:          /tmp
 build_name:        runner-build
 build_log:         runner-build-errors.log
 valid_ext:         .go, .tpl, .tmpl, .html, .gohtml
diff --git a/internal/platform/web/template-renderer/template_renderer.go b/internal/platform/web/template-renderer/template_renderer.go
index 4eddd82..5321a66 100644
--- a/internal/platform/web/template-renderer/template_renderer.go
+++ b/internal/platform/web/template-renderer/template_renderer.go
@@ -217,6 +217,9 @@ func NewTemplateRenderer(templateDir string, enableHotReload bool, globalViewDat
 	// Recursively loop through all folders/files in the template directory and group them by their
 	// template type. They are filename / filepath for lookup on render.
 	err := filepath.Walk(templateDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return errors.WithMessagef(err, "Failed to list directory %s", path)
+		}
 		dir := filepath.Base(filepath.Dir(path))
 
 		// Skip directories.