diff --git a/.dockerhub/Dockerfile b/.dockerhub/Dockerfile
index 15d670638..a694f8b3d 100644
--- a/.dockerhub/Dockerfile
+++ b/.dockerhub/Dockerfile
@@ -1,4 +1,4 @@
-ARG REMAGE_BASE_FLAVOR="latest"
+ARG REMAGE_BASE_FLAVOR="stable"
 
 FROM legendexp/remage-base:$REMAGE_BASE_FLAVOR
 
diff --git a/.dockerhub/hooks/build b/.dockerhub/hooks/build
new file mode 100755
index 000000000..1a4cb52c5
--- /dev/null
+++ b/.dockerhub/hooks/build
@@ -0,0 +1,24 @@
+#!/bin/bash
+# shellcheck disable=SC2001
+
+# for the dev remage image let's use the latest base image
+if [[ "$DOCKER_TAG" == "dev" ]]; then
+    docker build \
+        --build-arg REMAGE_BASE_FLAVOR="latest" \
+        --build-arg REMAGE_VERSION="dev" \
+        -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" .
+
+# check if tag name terminates with "-slim" and use the slim base image
+elif [[ $(echo "$DOCKER_TAG" | sed 's/.*-//') == "slim" ]]; then
+    _version=$(echo "$DOCKER_TAG" | sed 's/-[^-]*$//')
+    docker build \
+        --build-arg REMAGE_BASE_FLAVOR="slim" \
+        --build-arg REMAGE_VERSION="$_version" \
+        -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" .
+
+else  # use stable base image for all tagged versions
+    docker build \
+        --build-arg REMAGE_BASE_FLAVOR="stable" \
+        --build-arg REMAGE_VERSION="$DOCKER_TAG" \
+        -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" .
+fi
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index caec41ec9..68bedd225 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # guideline: only test on latest patch releases (and maybe previous one)
         container_version:
           - latest
           - stable
@@ -60,7 +59,7 @@ jobs:
           fi
 
       - name: Compare checked-in doc dump with current result
-        if: ${{ matrix.container_version == 'latest' }}
+        if: ${{ matrix.container_version == 'stable' }}
         run: |
           cd build
           cp ../docs/rmg-commands.md ../docs/rmg-commands.md.bak
diff --git a/.gitignore b/.gitignore
index cfe4a2aea..83bf498ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 /docs/_doxygen
 /docs/api
 /docs/extra
-build
+/build
 install
 .local
 .vscode