diff --git a/Makefile b/Makefile
index 9c13146..36448a5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,11 @@ REPO_NAME ?= microtrader
 TEST_REPO_NAME ?= microtrader-dev
 TEST_DIR ?= build/test-results/junit/
 
+# AWS ECR settings
+DOCKER_REGISTRY ?= 233522827226.dkr.ecr.eu-west-2.amazonaws.com
+AWS_ACCOUNT_ID ?= 233522827226
+DOCKER_LOGIN_EXPRESSION := eval $$(aws ecr get-login --registry-ids $(AWS_ACCOUNT_ID))
+
 # Release settings
 export HTTP_PORT ?= 8000
 export AUDIT_HTTP_ROOT ?= /audit/
diff --git a/docker/release/Dockerfile.audit b/docker/release/Dockerfile.audit
index a9b1eb8..1a87c5a 100644
--- a/docker/release/Dockerfile.audit
+++ b/docker/release/Dockerfile.audit
@@ -1,4 +1,4 @@
-FROM dockerproductionaws/microtrader-base
+FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
 MAINTAINER Justin Menga <justin.menga@gmail.com>
 LABEL application.component=microtrader-audit
 HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-33000}/${HTTP_ROOT}
@@ -6,4 +6,4 @@ HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT
 # Copy application artefacts
 ARG app_version
 LABEL application.version=${app_version}
-COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar
\ No newline at end of file
+COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar
diff --git a/docker/release/Dockerfile.dashboard b/docker/release/Dockerfile.dashboard
index db7ade6..333a29e 100644
--- a/docker/release/Dockerfile.dashboard
+++ b/docker/release/Dockerfile.dashboard
@@ -1,4 +1,4 @@
-FROM dockerproductionaws/microtrader-base
+FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
 MAINTAINER Justin Menga <justin.menga@gmail.com>
 LABEL application.component=microtrader-dashboard
 HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-8000}/
diff --git a/docker/release/Dockerfile.portfolio b/docker/release/Dockerfile.portfolio
index 8a7232c..c7b160f 100644
--- a/docker/release/Dockerfile.portfolio
+++ b/docker/release/Dockerfile.portfolio
@@ -1,8 +1,8 @@
-FROM dockerproductionaws/microtrader-base
+FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
 MAINTAINER Justin Menga <justin.menga@gmail.com>
 LABEL application.component=microtrader-portfolio
 
 # Copy application artefacts
 ARG app_version
 LABEL application.version=${app_version}
-COPY build/jars/microtrader-portfolio-${app_version}-fat.jar /app/app.jar
\ No newline at end of file
+COPY build/jars/microtrader-portfolio-${app_version}-fat.jar /app/app.jar
diff --git a/docker/release/Dockerfile.quote b/docker/release/Dockerfile.quote
index 146acf7..4092e3f 100644
--- a/docker/release/Dockerfile.quote
+++ b/docker/release/Dockerfile.quote
@@ -1,4 +1,4 @@
-FROM dockerproductionaws/microtrader-base
+FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
 MAINTAINER Justin Menga <justin.menga@gmail.com>
 LABEL application.component=microtrader-quote
 HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-35000}/${HTTP_ROOT}
@@ -6,4 +6,4 @@ HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT
 # Copy application artefacts
 ARG app_version
 LABEL application.version=${app_version}
-COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar
\ No newline at end of file
+COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar
diff --git a/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc b/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc
index 1300228..edde131 100644
--- a/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc
+++ b/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc
@@ -8,16 +8,14 @@
 ++++
 '''
 
-[cols=">25%,^25%,50%"]
+[cols=">25%,25%,50%"]
 [frame="topbot"]
 |===
 ^|Name | Type ^| Description
-|[[cash]]`cash`|`Number (double)`|
-+++
+|[[cash]]`@cash`|`Number (double)`|+++
 Sets the available cash. Method used by the converter.
 +++
-|[[shares]]`shares`|`Number (Integer)`|
-+++
+|[[shares]]`@shares`|`Number (Integer)`|+++
 Sets the owned shares. Method used by the converter.
 +++
 |===