diff --git a/client/Dockerfile b/client/Dockerfile
index 70945a4..8b574ed 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -25,7 +25,7 @@ ARG VERSION=dev
 
 EXPOSE 8080
 
-LABEL org.label-schema.name="manydecks/client"
+LABEL org.label-schema.name="massivedecks/manydecks-client"
 LABEL org.label-schema.description="The web client for Many Decks, a deck source for Massive Decks."
 LABEL org.label-schema.url="https://github.com/Lattyware/manydecks"
 LABEL org.label-schema.vcs-url="https://github.com/Lattyware/manydecks"
diff --git a/client/hooks/build b/client/hooks/build
new file mode 100644
index 0000000..b7aa2e4
--- /dev/null
+++ b/client/hooks/build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build \
+    --build-arg VCS_REF="`git rev-parse HEAD`" \
+    --build-arg BUILD_DATE="`date --rfc-3339=seconds`" \
+    --build-arg VERSION="`git describe --tags`" \
+    -t $IMAGE_NAME .
diff --git a/client/package.json b/client/package.json
index 13b0420..59184ae 100644
--- a/client/package.json
+++ b/client/package.json
@@ -4,8 +4,7 @@
   "description": "The web client to make and share custom decks for Massive Decks.",
   "scripts": {
     "dev": "npx webpack-dev-server --mode=development --port 8082",
-    "build": "npx webpack --mode=production",
-    "build-image": "docker build . -t \"manydecks/client\" --build-arg BUILD_DATE=\"$(date --rfc-3339=seconds)\""
+    "build": "npx webpack --mode=production"
   },
   "repository": {
     "type": "git",
diff --git a/server/Dockerfile b/server/Dockerfile
index 5fad9f8..d0ae713 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -18,7 +18,7 @@ ARG VERSION=dev
 
 ENV MD_VERSION $VERSION
 
-LABEL org.label-schema.name="manydecks/server"
+LABEL org.label-schema.name="massivedecks/manydecks-server"
 LABEL org.label-schema.description="The web server for Many Decks, a deck source for Massive Decks."
 LABEL org.label-schema.url="https://github.com/Lattyware/manydecks"
 LABEL org.label-schema.vcs-url="https://github.com/Lattyware/manydecks"
diff --git a/server/hooks/build b/server/hooks/build
new file mode 100644
index 0000000..b7aa2e4
--- /dev/null
+++ b/server/hooks/build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build \
+    --build-arg VCS_REF="`git rev-parse HEAD`" \
+    --build-arg BUILD_DATE="`date --rfc-3339=seconds`" \
+    --build-arg VERSION="`git describe --tags`" \
+    -t $IMAGE_NAME .
diff --git a/server/package.json b/server/package.json
index cbbbecf..13a51a0 100644
--- a/server/package.json
+++ b/server/package.json
@@ -16,8 +16,7 @@
     "prestart": "npm run build",
     "start": "node --es-module-specifier-resolution=node dist/index.js",
     "dev": "nodemon",
-    "debug": "nodemon --inspect",
-    "build-image": "docker build . -t \"manydecks/server\" --build-arg BUILD_DATE=\"$(date --rfc-3339=seconds)\""
+    "debug": "nodemon --inspect"
   },
   "dependencies": {
     "express": "^4.17.1",