diff --git a/.github/workflows/wait-and-upload.yml b/.github/workflows/wait-and-upload.yml
index d43ee02..7cf8aa5 100644
--- a/.github/workflows/wait-and-upload.yml
+++ b/.github/workflows/wait-and-upload.yml
@@ -21,7 +21,7 @@ on:
         default: true
       iog:
         description: 'with iog libs: libsodium, libsecp256k1, libblst, ...'
-        type: boolean
+        type: boolean # FIXME: this should rather be a 'string' that could be set to 'full' ...
         default: false
       iog-full:
         description: 'with full iog libs: libsodium, libsecp256k1, libblst, postgresql, R, ...'
@@ -120,7 +120,7 @@ jobs:
     # Likely, we consider using `-iog` as the default and do not generate other images.
     # Then the user choices left would be between native, `-windows` or `-js` target platforms,
     # and the GHC version (currently `ghc810` and `ghc96`).
-    if: ${{ contains(fromJSON('["x86_64-linux", "aarch64-linux"]'), inputs.platform) && contains(fromJson('["","-windows","-js"]'), inputs.target-platform) && contains(fromJson('["ghc810","ghc96"]'), inputs.compiler-nix-name) && !inputs.minimal }}
+    if: ${{ contains(fromJSON('["x86_64-linux", "aarch64-linux"]'), inputs.platform) && contains(fromJson('["","-windows","-js"]'), inputs.target-platform) && contains(fromJson('["ghc810","ghc96"]'), inputs.compiler-nix-name) && !inputs.minimal && inputs.iog && !inputs.iog-full }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -137,7 +137,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.platform }}.${{ inputs.compiler-nix-name }}${{ inputs.target-platform }}${{ inputs.iog-full || inputs.iog }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.platform }}.${{ inputs.compiler-nix-name }}${{ inputs.target-platform }}${{ (inputs.iog-full && '-iog-full') || (inputs.iog && '-iog') }}
           build-args: |
             PLATFORM=${{ inputs.platform }}
             TARGET_PLATFORM=${{ inputs.target-platform }}
diff --git a/Dockerfile b/Dockerfile
index bc120ea..68f2906 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ ARG TARGET_PLATFORM=""
 ARG COMPILER_NIX_NAME="ghc96"
 ARG MINIMAL="false"
 ARG IOG="true"
+ARG IOG_FULL="false"
 
 RUN DEBIAN_FRONTEND=noninteractive \
  && apt-get update \
@@ -15,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
  && SUFFIX='' \
  && if [ "$MINIMAL" = "true" ]; then SUFFIX="${SUFFIX}-minimal"; fi \
  && if [ "$IOG" = "true" ]; then SUFFIX="${SUFFIX}-iog"; fi \
- && if [ "$IOG_FULL" = "true" ]; then SUFFIX="${SUFFIX}-iog-full"; fi \
+ && if [ "$IOG_FULL" = "true" ]; then SUFFIX="${SUFFIX}-full"; fi \
  && ./fetch-docker.sh input-output-hk/devx $PLATFORM.$COMPILER_NIX_NAME$TARGET_PLATFORM${SUFFIX}-env | zstd -d | nix-store --import | tee store-paths.txt
 
 RUN cat <<EOF >> $HOME/.bashrc