diff --git a/.gitignore b/.gitignore
index 91776448..eef7ab61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ Build
 _build
 blib
 docker/netdisco
+!docker/netdisco-*/hooks/*
diff --git a/docker/netdisco-backend/Dockerfile b/docker/netdisco-backend/Dockerfile
index bbd5b078..607fc0b2 100644
--- a/docker/netdisco-backend/Dockerfile
+++ b/docker/netdisco-backend/Dockerfile
@@ -1,5 +1,8 @@
 # vim: ft=Dockerfile
-FROM netdisco-base:latest
+ARG TAG=master
+FROM docker.io/netdisco:${TAG}-base
+
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 
 USER netdisco:netdisco
 WORKDIR $NETDISCO_HOME/netdisco-mibs
@@ -8,6 +11,5 @@ RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
   sort -rg | head -n1 | xargs -n1 curl -L | tar --strip-components=1 -zxf -
 
 WORKDIR $NETDISCO_HOME
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 ENTRYPOINT ["/home/netdisco/bin/netdisco-backend"]
 CMD ["foreground"]
diff --git a/docker/netdisco-backend/hooks/build b/docker/netdisco-backend/hooks/build
new file mode 100755
index 00000000..92084c68
--- /dev/null
+++ b/docker/netdisco-backend/hooks/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .
diff --git a/docker/netdisco-do/Dockerfile b/docker/netdisco-do/Dockerfile
index 0b159148..bf31934c 100644
--- a/docker/netdisco-do/Dockerfile
+++ b/docker/netdisco-do/Dockerfile
@@ -1,8 +1,10 @@
 # vim: ft=Dockerfile
-FROM netdisco-base:latest
+ARG TAG=master
+FROM docker.io/netdisco:${TAG}-base
+
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 
 USER netdisco:netdisco
 WORKDIR $NETDISCO_HOME
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 ENTRYPOINT ["/home/netdisco/bin/netdisco-do"]
 CMD [""]
diff --git a/docker/netdisco-do/hooks/build b/docker/netdisco-do/hooks/build
new file mode 100755
index 00000000..92084c68
--- /dev/null
+++ b/docker/netdisco-do/hooks/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .
diff --git a/docker/netdisco-postgresql/Dockerfile b/docker/netdisco-postgresql/Dockerfile
index 93880067..9545f823 100644
--- a/docker/netdisco-postgresql/Dockerfile
+++ b/docker/netdisco-postgresql/Dockerfile
@@ -6,6 +6,11 @@ RUN apk add --no-cache \
   jq \
   tar
 
+COPY netdisco-db-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/netdisco-db-entrypoint.sh
+
+RUN PGDATA=/var/lib/postgresql/netdisco-pgdata /usr/local/bin/docker-entrypoint.sh postgres --version
+
 WORKDIR /var/lib/postgresql/netdisco-sql
 RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
   jq '.[]|.name|select(test("^\\d+\\.\\d+$"))|"https://api.github.com/repos/netdisco/netdisco/tarball/"+.' | \
@@ -14,12 +19,8 @@ RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
   curl -sLO "https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.sql" && \
   curl -sLO "https://raw.githubusercontent.com/netdisco/netdisco/master/lib/App/Netdisco/DB.pm"
 
-RUN PGDATA=/var/lib/postgresql/netdisco-pgdata /usr/local/bin/docker-entrypoint.sh postgres --version
-
-COPY netdisco-db-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/netdisco-db-entrypoint.sh
+VOLUME ["/var/lib/postgresql/data"]
 
 WORKDIR /
-VOLUME ["/var/lib/postgresql/data"]
 ENTRYPOINT ["/usr/local/bin/netdisco-db-entrypoint.sh"]
 CMD ["postgres"]
diff --git a/docker/netdisco-web/Dockerfile b/docker/netdisco-web/Dockerfile
index 3ceb9e87..71c65198 100644
--- a/docker/netdisco-web/Dockerfile
+++ b/docker/netdisco-web/Dockerfile
@@ -1,8 +1,11 @@
 # vim: ft=Dockerfile
-FROM netdisco-base:latest
+ARG TAG=master
+FROM docker.io/netdisco:${TAG}-base
+
+EXPOSE 5000
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 
 USER netdisco:netdisco
 WORKDIR $NETDISCO_HOME
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
 ENTRYPOINT ["/home/netdisco/bin/netdisco-web"]
 CMD ["foreground"]
diff --git a/docker/netdisco-web/hooks/build b/docker/netdisco-web/hooks/build
new file mode 100755
index 00000000..92084c68
--- /dev/null
+++ b/docker/netdisco-web/hooks/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .