diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb239ceb3..bcdf362ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,6 +88,9 @@ jobs:
       - run:
           name: Test - Content Negotiation
           command: npm run test:content-negotiation
+      - run:
+          name: Test - Build Docker image
+          command: DOCKERID=circliciTest npm run docker:build
 
 workflows:
   build_and_test:
diff --git a/package.json b/package.json
index 666832db8..37b362bc8 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,9 @@
     "phb": "node --experimental-require-module scripts/phb.js",
     "prod": "set NODE_ENV=production && npm run build",
     "postinstall": "npm run build",
-    "start": "node --experimental-require-module server.js"
+    "start": "node --experimental-require-module server.js",
+    "docker:build": "docker build -t ${DOCKERID}/homebrewery:$npm_package_version .",
+    "docker:publish": "docker login && docker push  ${DOCKERID}/homebrewery:$npm_package_version"
   },
   "author": "stolksdorf",
   "license": "MIT",