diff --git a/images/caffe2/cuda11-8/Dockerfile b/images/caffe2/cuda11-8/Dockerfile
index 787509a..6db1ef3 100644
--- a/images/caffe2/cuda11-8/Dockerfile
+++ b/images/caffe2/cuda11-8/Dockerfile
@@ -5,7 +5,7 @@ ARG INTERPRETER
 ARG INTERPRETER_VERSION
 
 LABEL maintainer=sergey.monakhov@gmail.com \
-      vendor=puzl.ee
+      vendor=https://puzl.cloud
 
 ENV USER=ubuntu \
     UID=1000 \
@@ -102,14 +102,25 @@ RUN rm -rf /usr/local/bin/pip3 \
 
 RUN ${INTERPRETER} -m pip install -r /tmp/requirements.txt
 
-RUN ${INTERPRETER} -m pip install \
+RUN case ${INTERPRETER} in \
+    python3.9) \
+      export CP_FORMAT=cp39 \
+      ;; \
+    python3.10) \
+      export CP_FORMAT=cp310 \
+      ;; \
+    python3.11) \
+      export CP_FORMAT=cp311 \
+      ;; \
+  esac \
+  && ${INTERPRETER} -m pip install \
         torch==2.1.0 \
         torchvision==0.16.0 \
         torchaudio==2.1.0 \
         jupyterlab==4.0.7 \
-        --index-url https://download.pytorch.org/whl/cu118 \
-        --extra-index-url https://pypi.org/simple \
-    && ${INTERPRETER} -m pip cache purge
+      --index-url https://download.pytorch.org/whl/cu118 \
+      --extra-index-url https://pypi.org/simple \
+  && ${INTERPRETER} -m pip cache purge
 
 RUN curl https://rclone.org/install.sh -o ~/install.sh \
     && chmod +x ~/install.sh \
diff --git a/images/fastai/cuda11-8/Dockerfile b/images/fastai/cuda11-8/Dockerfile
index 8a8534a..a5a9845 100644
--- a/images/fastai/cuda11-8/Dockerfile
+++ b/images/fastai/cuda11-8/Dockerfile
@@ -5,7 +5,7 @@ ARG INTERPRETER
 ARG INTERPRETER_VERSION
 
 LABEL maintainer=sergey.monakhov@gmail.com \
-      vendor=puzl.ee
+      vendor=https://puzl.cloud
 
 ENV USER=ubuntu \
     UID=1000 \
@@ -102,15 +102,26 @@ RUN rm -rf /usr/local/bin/pip3 \
 
 RUN ${INTERPRETER} -m pip install -r /tmp/requirements.txt
 
-RUN ${INTERPRETER} -m pip install \
+RUN case ${INTERPRETER} in \
+    python3.9) \
+      export CP_FORMAT=cp39 \
+      ;; \
+    python3.10) \
+      export CP_FORMAT=cp310 \
+      ;; \
+    python3.11) \
+      export CP_FORMAT=cp311 \
+      ;; \
+  esac \
+  && ${INTERPRETER} -m pip install \
         torch==2.0.1 \
         torchvision==0.15.2 \
         torchaudio==2.0.2 \
         fastai==2.7.13 \
         jupyterlab==4.0.7 \
-        --index-url https://download.pytorch.org/whl/cu118 \
-        --extra-index-url https://pypi.org/simple \
-    && ${INTERPRETER} -m pip cache purge
+      --index-url https://download.pytorch.org/whl/cu118 \
+      --extra-index-url https://pypi.org/simple \
+  && ${INTERPRETER} -m pip cache purge
 
 RUN curl https://rclone.org/install.sh -o ~/install.sh \
     && chmod +x ~/install.sh \
diff --git a/images/keras/cuda11-8/Dockerfile b/images/keras/cuda11-8/Dockerfile
index 3918d6f..8a050b0 100644
--- a/images/keras/cuda11-8/Dockerfile
+++ b/images/keras/cuda11-8/Dockerfile
@@ -109,16 +109,15 @@ RUN rm -rf /usr/local/bin/pip3 \
 
 RUN ${INTERPRETER} -m pip install -r /tmp/requirements.txt
 
-RUN \
-  case ${INTERPRETER} in \
+RUN case ${INTERPRETER} in \
     python3.9) \
-      CP_FORMAT=cp39 \
+      export CP_FORMAT=cp39 \
       ;; \
     python3.10) \
-      CP_FORMAT=cp310 \
+      export CP_FORMAT=cp310 \
       ;; \
     python3.11) \
-      CP_FORMAT=cp311 \
+      export CP_FORMAT=cp311 \
       ;; \
   esac \
   && ${INTERPRETER} -m pip install \