diff --git a/.env b/.env
index 05b6f73..7f75aca 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # Default image version (override using --env-file or -e)
-APP_VERSION=latest
+VERSION=test
 
 # GaLAHaD-like endpoint
 CALLBACK_SERVER=http://server:8010/internal/jobs
diff --git a/.github/workflows/dev-to-docker.yml b/.github/workflows/dev-to-docker.yml
index 40bcedb..49c7836 100644
--- a/.github/workflows/dev-to-docker.yml
+++ b/.github/workflows/dev-to-docker.yml
@@ -22,4 +22,4 @@ jobs:
       - name: Build and push 
         run: ./buildandpushall.sh
         env:
-          VERSION_LABEL: dev
+          VERSION: dev
diff --git a/.github/workflows/prod-to-docker.yml b/.github/workflows/prod-to-docker.yml
index cbbb666..51e45a3 100644
--- a/.github/workflows/prod-to-docker.yml
+++ b/.github/workflows/prod-to-docker.yml
@@ -23,4 +23,4 @@ jobs:
       - name: Build and push 
         run: ./buildandpushall.sh
         env:
-          VERSION_LABEL: latest
+          VERSION: latest
diff --git a/buildall.sh b/buildall.sh
index 84efe0b..c51fbab 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,29 +1,29 @@
 # Set the default label
-: ${VERSION_LABEL:=dev}
+: ${VERSION:=latest}
 
-echo "Will build taggers with version <$VERSION_LABEL>. Set VERSION_LABEL to override this."
+echo "Will build taggers with version <$VERSION>. Set VERSION to override this."
 
 # Base image
-docker build -t instituutnederlandsetaal/taggers-dockerized-base:$VERSION_LABEL base
+docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-base:$VERSION base
 
 # PIE
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION_LABEL pie/base
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION_LABEL pie/TDN-1400-1600
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION_LABEL pie/TDN-1600-1900
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION_LABEL pie/TDN-ALL
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION_LABEL pie/TDN-BAB
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION_LABEL pie/TDN-CLVN
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION_LABEL pie/TDN-COUR
-docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION_LABEL pie/TDN-DBNLDQ
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION pie/base
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION pie/TDN-1400-1600
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION pie/TDN-1600-1900
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION pie/TDN-ALL
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION pie/TDN-BAB
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION pie/TDN-CLVN
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION pie/TDN-COUR
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION pie/TDN-DBNLDQ
 
 # Huggingface
 # Commented for now, as we need Git LFS to build these. Perhaps in the future.
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION_LABEL huggingface/base
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION_LABEL huggingface/TDN-1400-1600
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION_LABEL huggingface/TDN-1600-1900
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION_LABEL huggingface/TDN-ALL
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION_LABEL huggingface/TDN-ALL-ENHANCED
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION_LABEL huggingface/TDN-BAB
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION_LABEL huggingface/TDN-CLVN
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION_LABEL huggingface/TDN-COUR
-# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION_LABEL huggingface/TDN-DBNLDQ
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION huggingface/base
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION huggingface/TDN-1400-1600
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION huggingface/TDN-1600-1900
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION huggingface/TDN-ALL
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION huggingface/TDN-ALL-ENHANCED
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION huggingface/TDN-BAB
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION huggingface/TDN-CLVN
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION huggingface/TDN-COUR
+# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION huggingface/TDN-DBNLDQ
diff --git a/buildandpushall.sh b/buildandpushall.sh
index f9efa5d..110b934 100755
--- a/buildandpushall.sh
+++ b/buildandpushall.sh
@@ -1,26 +1,26 @@
 # Set the default label
-: ${VERSION_LABEL:=dev}
+: ${VERSION:=dev}
 
-echo "Will build taggers with version <$VERSION_LABEL>. Set VERSION_LABEL to override this."
+echo "Will build taggers with version <$VERSION>. Set VERSION to override this."
 
 ./buildall.sh
 
 # PIE
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION_LABEL
-docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION_LABEL
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION
 
 # Huggingface
 # Commented for now, as we need Git LFS to build these. Perhaps in the future.
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION_LABEL
-# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION_LABEL
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION
+# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION
diff --git a/docker-compose.yml b/docker-compose.yml
index c732a88..dd8a938 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
     # pie (ports: 810x)
     pie-tdn-1400-1600:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:${VERSION}
         build:
             context: pie/TDN-1400-1600
         environment:
@@ -11,7 +11,7 @@ services:
             - 8100:8080
 
     pie-tdn-1600-1900:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:${VERSION}
         build:
             context: pie/TDN-1600-1900
         environment:
@@ -21,7 +21,7 @@ services:
             - 8101:8080
 
     pie-tdn-all:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:${VERSION}
         build:
             context: pie/TDN-ALL
         environment:
@@ -31,7 +31,7 @@ services:
             - 8102:8080
     
     pie-tdn-bab:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:${VERSION}
         build:
             context: pie/TDN-BAB
         environment:
@@ -41,7 +41,7 @@ services:
             - 8103:8080
 
     pie-tdn-clvn:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:${VERSION}
         build:
             context: pie/TDN-CLVN
         environment:
@@ -51,7 +51,7 @@ services:
             - 8104:8080
 
     pie-tdn-cour:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:${VERSION}
         build:
             context: pie/TDN-COUR
         environment:
@@ -61,7 +61,7 @@ services:
             - 8105:8080
 
     pie-tdn-dbnldq:
-        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:${VERSION}
         build:
             context: pie/TDN-DBNLDQ
         environment:
@@ -72,7 +72,7 @@ services:
 
     # huggingface (port: 811x)
     hug-tdn-1400-1600:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:${VERSION}
         build:
             context: huggingface/TDN-1400-1600
         environment:
@@ -82,7 +82,7 @@ services:
             - 8110:8080
 
     hug-tdn-1600-1900:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:${VERSION}
         build:
             context: huggingface/TDN-1600-1900
         environment:
@@ -92,7 +92,7 @@ services:
             - 8111:8080
 
     hug-tdn-all:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:${VERSION}
         build:
             context: huggingface/TDN-ALL
         environment:
@@ -102,7 +102,7 @@ services:
             - 8112:8080
     
     hug-tdn-bab:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:${VERSION}
         build:
             context: huggingface/TDN-BAB
         environment:
@@ -112,7 +112,7 @@ services:
             - 8113:8080
 
     hug-tdn-clvn:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:${VERSION}
         build:
             context: huggingface/TDN-CLVN
         environment:
@@ -122,7 +122,7 @@ services:
             - 8114:8080
 
     hug-tdn-cour:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:${VERSION}
         build:
             context: huggingface/TDN-COUR
         environment:
@@ -132,7 +132,7 @@ services:
             - 8115:8080
 
     hug-tdn-dbnldq:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:${VERSION}
         build:
             context: huggingface/TDN-DBNLDQ
         environment:
@@ -142,7 +142,7 @@ services:
             - 8116:8080
 
     hug-tdn-all-enhanced:
-        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:${APP_VERSION}
+        image: instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:${VERSION}
         build:
             context: huggingface/TDN-ALL-ENHANCED
         environment:
diff --git a/huggingface/TDN-1400-1600/Dockerfile b/huggingface/TDN-1400-1600/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-1400-1600/Dockerfile
+++ b/huggingface/TDN-1400-1600/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-1600-1900/Dockerfile b/huggingface/TDN-1600-1900/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-1600-1900/Dockerfile
+++ b/huggingface/TDN-1600-1900/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-ALL-ENHANCED/Dockerfile b/huggingface/TDN-ALL-ENHANCED/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-ALL-ENHANCED/Dockerfile
+++ b/huggingface/TDN-ALL-ENHANCED/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-ALL/Dockerfile b/huggingface/TDN-ALL/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-ALL/Dockerfile
+++ b/huggingface/TDN-ALL/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-BAB/Dockerfile b/huggingface/TDN-BAB/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-BAB/Dockerfile
+++ b/huggingface/TDN-BAB/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-CLVN/Dockerfile b/huggingface/TDN-CLVN/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-CLVN/Dockerfile
+++ b/huggingface/TDN-CLVN/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-COUR/Dockerfile b/huggingface/TDN-COUR/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-COUR/Dockerfile
+++ b/huggingface/TDN-COUR/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/TDN-DBNLDQ/Dockerfile b/huggingface/TDN-DBNLDQ/Dockerfile
index eba71e5..70216c5 100644
--- a/huggingface/TDN-DBNLDQ/Dockerfile
+++ b/huggingface/TDN-DBNLDQ/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION
 
 COPY --link . ./
diff --git a/huggingface/base/Dockerfile b/huggingface/base/Dockerfile
index 653bd0a..8dd5618 100644
--- a/huggingface/base/Dockerfile
+++ b/huggingface/base/Dockerfile
@@ -1,12 +1,12 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-base:$tag
-
-COPY requirements.sh requirements.txt nltk-download.py ./
-RUN ./requirements.sh && python3 nltk-download.py
-
-COPY --link process.py /
-COPY --link model.config /
-COPY --link /lemmatizer ./lemmatizer
-COPY --link /lexicon ./lexicon
-COPY --link /huggingface/lemmatizer ./huggingface/lemmatizer
-COPY --link /huggingface/tagging ./huggingface/tagging
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-base:$VERSION
+
+COPY requirements.sh requirements.txt nltk-download.py ./
+RUN ./requirements.sh && python3 nltk-download.py
+
+COPY --link process.py /
+COPY --link model.config /
+COPY --link /lemmatizer ./lemmatizer
+COPY --link /lexicon ./lexicon
+COPY --link /huggingface/lemmatizer ./huggingface/lemmatizer
+COPY --link /huggingface/tagging ./huggingface/tagging
diff --git a/pie/TDN-1400-1600/Dockerfile b/pie/TDN-1400-1600/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-1400-1600/Dockerfile
+++ b/pie/TDN-1400-1600/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-1600-1900/Dockerfile b/pie/TDN-1600-1900/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-1600-1900/Dockerfile
+++ b/pie/TDN-1600-1900/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-ALL/Dockerfile b/pie/TDN-ALL/Dockerfile
index 392172b..92e2ea2 100644
--- a/pie/TDN-ALL/Dockerfile
+++ b/pie/TDN-ALL/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:test
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-BAB/Dockerfile b/pie/TDN-BAB/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-BAB/Dockerfile
+++ b/pie/TDN-BAB/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-CLVN/Dockerfile b/pie/TDN-CLVN/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-CLVN/Dockerfile
+++ b/pie/TDN-CLVN/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-COUR/Dockerfile b/pie/TDN-COUR/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-COUR/Dockerfile
+++ b/pie/TDN-COUR/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/TDN-DBNLDQ/Dockerfile b/pie/TDN-DBNLDQ/Dockerfile
index 392172b..2fdd9fb 100644
--- a/pie/TDN-DBNLDQ/Dockerfile
+++ b/pie/TDN-DBNLDQ/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION
 
 COPY --link *.tar ./model.tar
diff --git a/pie/base/Dockerfile b/pie/base/Dockerfile
index b498648..3ad1b77 100644
--- a/pie/base/Dockerfile
+++ b/pie/base/Dockerfile
@@ -1,5 +1,5 @@
-ARG tag=dev
-FROM instituutnederlandsetaal/taggers-dockerized-base:$tag
+ARG VERSION=dev
+FROM instituutnederlandsetaal/taggers-dockerized-base:$VERSION
 
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
diff --git a/readme.md b/readme.md
index 9892137..7f5f29e 100644
--- a/readme.md
+++ b/readme.md
@@ -55,7 +55,7 @@ docker compose --env-file .env.dev
 ## Creating your own tagger
 To create your own tagger, use the base tagger as a starting point and overwrite `process.py`. I.e., start your Dockerfile with:
 ```
-FROM instituutnederlandsetaal/taggers-dockerized-base:$tag
+FROM instituutnederlandsetaal/taggers-dockerized-base:$VERSION
 COPY --link process.py /
 ```
 And fill out the process() and (optionally) init() functions of [base/process.py](https://github.com/INL/galahad-taggers-dockerized/blob/release/base/process.py).