diff --git a/.github/workflows/docker-image-mariadb103-py38-mysqlclient201.yml b/.github/workflows/docker-image-mariadb103-py38-mysqlclient201.yml
deleted file mode 100644
index 05e3ee9..0000000
--- a/.github/workflows/docker-image-mariadb103-py38-mysqlclient201.yml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-name: Docker Image CI mariadb103-py38-mysqlclient201
-
-on:
-  push:
-    branch:
-      - main
-      - lie_tests_using_containers
-    paths:
-      - 'test-containers/mariadb103-py38-mysqlclient201/**'
-      - '.github/workflows/docker-image-mariadb103-py38-mysqlclient201.yml'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.actor }}/test-container-mariadb103-py38-mysqlclient201
-  CONTEXT: test-containers/mariadb103-py38-mysqlclient201
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      # - name: Build the Docker image
-      #   run: docker build . --file Dockerfile --tag mariadb103-py38-mysqlclient201:$(date +%s)
-
-      # # Install the cosign tool
-      # # https://github.com/sigstore/cosign-installer
-      # - name: Install cosign
-      #   uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
-      #   with:
-      #     cosign-release: 'v1.11.0'
-
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata (tags, labels)
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      # Setting up Docker Buildx with docker-container driver is required
-      # at the moment to be able to use a subdirectory with Git context
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image with Buildx
-        id: build-and-push
-        uses: docker/build-push-action@v3
-        with:
-          context: ${{ env.CONTEXT }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      # # Sign the resulting Docker image digest.
-      # # This will only write to the public Rekor transparency log when the Docker
-      # # repository is public to avoid leaking data. If you would like to publish
-      # # transparency data even for private images, pass --force to cosign below.
-      # # https://github.com/sigstore/cosign
-      # - name: Sign the published Docker image
-      #   env:
-      #     COSIGN_EXPERIMENTAL: "true"
-      #   # This step uses the identity token to provision an ephemeral certificate
-      #   # against the sigstore community Fulcio instance.
-      #   run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}
-
-
-
-# mariadb103-py38-mysqlclient201
-# mariadb103-py38-pymysql093
-# mariadb103-py39-mysqlclient203
-# mariadb103-py39-pymysql093
-# mariadb106-py310-mysqlclient211
-# mariadb106-py310-pymysql093
-# mariadb106-py310-pymysql102
-# my57-py38-mysqlclient201
-# my57-py38-pymysql0711
-# my57-py38-pymysql093
-# my80-py310-mysqlclient211
-# my80-py310-pymysql093
-# my80-py310-pymysql102
-# my80-py38-mysqlclient201
-# my80-py38-pymysql0711
-# my80-py38-pymysql093
-# my80-py39-mysqlclient203
-# my80-py39-pymysql0711
-# my80-py39-pymysql093
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000..69660fc
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,86 @@
+---
+name: Docker Image CI mariadb103-py38-mysqlclient201
+
+on:
+  push:
+    branch:
+      - main
+      - lie_tests_using_containers
+    paths:
+      - 'test-containers/**'
+      - '.github/workflows/docker-image.yml'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.actor }}/test-container-
+  CONTEXT: containers
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        include:
+          - subfolder: mariadb103-py38-mysqlclient201
+          - subfolder: mariadb103-py38-pymysql093
+          - subfolder: mariadb103-py39-mysqlclient203
+          - subfolder: mariadb103-py39-pymysql093
+          - subfolder: mariadb106-py310-mysqlclient211
+          - subfolder: mariadb106-py310-pymysql093
+          - subfolder: mariadb106-py310-pymysql102
+          - subfolder: my57-py38-mysqlclient201
+          - subfolder: my57-py38-pymysql0711
+          - subfolder: my57-py38-pymysql093
+          - subfolder: my80-py310-mysqlclient211
+          - subfolder: my80-py310-pymysql093
+          - subfolder: my80-py310-pymysql102
+          - subfolder: my80-py38-mysqlclient201
+          - subfolder: my80-py38-pymysql0711
+          - subfolder: my80-py38-pymysql093
+          - subfolder: my80-py39-mysqlclient203
+          - subfolder: my80-py39-pymysql0711
+          - subfolder: my80-py39-pymysql093
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images:
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}${{ matrix.subfolder }}
+
+      # Setting up Docker Buildx with docker-container driver is required
+      # at the moment to be able to use a subdirectory with Git context
+      #
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image with Buildx
+        id: build-and-push
+        uses: docker/build-push-action@v3
+        with:
+          context: ${{ env.CONTEXT }}/${{ matrix.subfolder }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/test-containers/mariadb103-py38-pymysql093/Dockerfile b/test-containers/mariadb103-py38-pymysql093/Dockerfile
new file mode 100644
index 0000000..9b11973
--- /dev/null
+++ b/test-containers/mariadb103-py38-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mariadb-client-10.3
+
+# iproute2                     # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    mariadb-client \
+    iproute2
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/mariadb103-py39-mysqlclient203/Dockerfile b/test-containers/mariadb103-py39-mysqlclient203/Dockerfile
new file mode 100644
index 0000000..5362cd8
--- /dev/null
+++ b/test-containers/mariadb103-py39-mysqlclient203/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mariadb-client-10.3
+
+# iproute2                     # To grab docker network gateway address
+# python3.9-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.9 \
+    python3.9-dev \
+    mariadb-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.9 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.0.3 
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/mariadb103-py39-pymysql093/Dockerfile b/test-containers/mariadb103-py39-pymysql093/Dockerfile
new file mode 100644
index 0000000..347e498
--- /dev/null
+++ b/test-containers/mariadb103-py39-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mariadb-client-10.3
+
+# iproute2                     # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.9 \
+    mariadb-client \
+    iproute2
+
+RUN python3.9 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/mariadb106-py310-mysqlclient211/Dockerfile b/test-containers/mariadb106-py310-mysqlclient211/Dockerfile
new file mode 100644
index 0000000..5365d24
--- /dev/null
+++ b/test-containers/mariadb106-py310-mysqlclient211/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mariadb-client-10.6
+
+# iproute2                     # To grab docker network gateway address
+# python3.10-dev               # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    python3.10-dev \
+    mariadb-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.1.1 
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/mariadb106-py310-pymysql093/Dockerfile b/test-containers/mariadb106-py310-pymysql093/Dockerfile
new file mode 100644
index 0000000..6686bbf
--- /dev/null
+++ b/test-containers/mariadb106-py310-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mariadb-client-10.6
+
+# iproute2                     # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    mariadb-client \
+    iproute2
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/mariadb106-py310-pymysql102/Dockerfile b/test-containers/mariadb106-py310-pymysql102/Dockerfile
new file mode 100644
index 0000000..4d4da5c
--- /dev/null
+++ b/test-containers/mariadb106-py310-pymysql102/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mariadb-client-10.6
+
+# iproute2                     # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    mariadb-client \
+    iproute2
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir pymysql==1.0.2
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my57-py38-mysqlclient201/Dockerfile b/test-containers/my57-py38-mysqlclient201/Dockerfile
new file mode 100644
index 0000000..3b58972
--- /dev/null
+++ b/test-containers/my57-py38-mysqlclient201/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu1804-test-container:main
+# ubuntu1804 comes with mysql-client-5.7
+
+# iproute2                     # To grab docker network gateway address
+# python3.8-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    python3.8-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.0.1
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my57-py38-pymysql0711/Dockerfile b/test-containers/my57-py38-pymysql0711/Dockerfile
new file mode 100644
index 0000000..a4e46b0
--- /dev/null
+++ b/test-containers/my57-py38-pymysql0711/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu1804-test-container:main
+# ubuntu1804 comes with mysql-client-5.7
+
+# iproute2                     # To grab docker network gateway address
+# python3.8-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    python3.8-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.7.11
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my57-py38-pymysql093/Dockerfile b/test-containers/my57-py38-pymysql093/Dockerfile
new file mode 100644
index 0000000..492e846
--- /dev/null
+++ b/test-containers/my57-py38-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu1804-test-container:main
+# ubuntu1804 comes with mysql-client-5.7
+
+# iproute2  # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    mysql-client \
+    iproute2
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py310-mysqlclient211/Dockerfile b/test-containers/my80-py310-mysqlclient211/Dockerfile
new file mode 100644
index 0000000..7ce9110
--- /dev/null
+++ b/test-containers/my80-py310-mysqlclient211/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+# python3.10-dev               # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    python3.10-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.1.1
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py310-pymysql093/Dockerfile b/test-containers/my80-py310-pymysql093/Dockerfile
new file mode 100644
index 0000000..1b7d40f
--- /dev/null
+++ b/test-containers/my80-py310-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    mysql-client \
+    iproute2
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py310-pymysql102/Dockerfile b/test-containers/my80-py310-pymysql102/Dockerfile
new file mode 100644
index 0000000..ac42407
--- /dev/null
+++ b/test-containers/my80-py310-pymysql102/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2204-test-container:main
+# ubuntu2204 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.10 \
+    mysql-client \
+    iproute2
+
+RUN python3.10 -m pip install --disable-pip-version-check --no-cache-dir pymysql==1.0.2
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py38-mysqlclient201/Dockerfile b/test-containers/my80-py38-mysqlclient201/Dockerfile
new file mode 100644
index 0000000..08cb711
--- /dev/null
+++ b/test-containers/my80-py38-mysqlclient201/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+# python3.8-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    python3.8-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.0.1
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py38-pymysql0711/Dockerfile b/test-containers/my80-py38-pymysql0711/Dockerfile
new file mode 100644
index 0000000..08ac9a0
--- /dev/null
+++ b/test-containers/my80-py38-pymysql0711/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+# python3.8-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    python3.8-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.7.11
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py38-pymysql093/Dockerfile b/test-containers/my80-py38-pymysql093/Dockerfile
new file mode 100644
index 0000000..684fdb3
--- /dev/null
+++ b/test-containers/my80-py38-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.8 \
+    mysql-client \
+    iproute2
+
+RUN python3.8 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py39-mysqlclient203/Dockerfile b/test-containers/my80-py39-mysqlclient203/Dockerfile
new file mode 100644
index 0000000..3e07593
--- /dev/null
+++ b/test-containers/my80-py39-mysqlclient203/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+# python3.9-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.9 \
+    python3.9-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.9 -m pip install --disable-pip-version-check --no-cache-dir mysqlclient==2.0.3
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py39-pymysql0711/Dockerfile b/test-containers/my80-py39-pymysql0711/Dockerfile
new file mode 100644
index 0000000..ff904ea
--- /dev/null
+++ b/test-containers/my80-py39-pymysql0711/Dockerfile
@@ -0,0 +1,21 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+# python3.9-dev                # Reqs for mysqlclient
+# default-libmysqlclient-dev   # Reqs for mysqlclient
+# build-essential              # Reqs for mysqlclient
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.9 \
+    python3.9-dev \
+    mysql-client \
+    iproute2 \
+    default-libmysqlclient-dev \
+    build-essential
+
+RUN python3.9 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.7.11
+
+ENV container=docker
+CMD ["/sbin/init"]
diff --git a/test-containers/my80-py39-pymysql093/Dockerfile b/test-containers/my80-py39-pymysql093/Dockerfile
new file mode 100644
index 0000000..76e631f
--- /dev/null
+++ b/test-containers/my80-py39-pymysql093/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/ansible/ubuntu2004-test-container:main
+# ubuntu2004 comes with mysql-client-8
+
+# iproute2  # To grab docker network gateway address
+RUN apt update -y && \
+    DEBIAN_FRONTEND=noninteractive apt upgrade -y --no-install-recommends && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    python3.9 \
+    mysql-client \
+    iproute2
+
+RUN python3.9 -m pip install --disable-pip-version-check --no-cache-dir pymysql==0.9.3
+
+ENV container=docker
+CMD ["/sbin/init"]