diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
index 8734fe3490..6a94affc68 100644
--- a/.github/workflows/pythonpublish.yml
+++ b/.github/workflows/pythonpublish.yml
@@ -137,6 +137,7 @@ jobs:
           tags: ${{ steps.sqlalchemy-names.outputs.tags }}
           build-args: |
             VERSION=${{ needs.deploy.outputs.version }}
-          file: ./plugins/flytekit-sqlalchemy/Dockerfile.py${{ matrix.python-version }}
+            PYTHON_VERSION=${{ matrix.python-version }}
+          file: ./plugins/flytekit-sqlalchemy/Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/plugins/flytekit-sqlalchemy/Dockerfile b/plugins/flytekit-sqlalchemy/Dockerfile
new file mode 100644
index 0000000000..ed1a644d8f
--- /dev/null
+++ b/plugins/flytekit-sqlalchemy/Dockerfile
@@ -0,0 +1,19 @@
+ARG PYTHON_VERSION
+FROM python:${PYTHON_VERSION}-slim-buster
+
+WORKDIR /root
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV PYTHONPATH /root
+
+ARG VERSION
+
+RUN pip install sqlalchemy \
+		psycopg2-binary \
+		pymysql \
+		flytekitplugins-sqlalchemy==$VERSION \
+		flytekit==$VERSION
+
+RUN useradd -u 1000 flytekit
+RUN chown flytekit: /root
+USER flytekit
diff --git a/plugins/flytekit-sqlalchemy/Dockerfile.py3.10 b/plugins/flytekit-sqlalchemy/Dockerfile.py3.10
deleted file mode 100644
index 791b13fa53..0000000000
--- a/plugins/flytekit-sqlalchemy/Dockerfile.py3.10
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM python:3.10-slim-buster
-
-WORKDIR /app
-ENV VENV /opt/venv
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-ENV PYTHONPATH /app
-
-RUN pip install awscli
-RUN pip install gsutil
-
-ARG VERSION
-
-# Virtual environment
-RUN python3.10 -m venv ${VENV}
-RUN ${VENV}/bin/pip install wheel
-
-RUN ${VENV}/bin/pip install sqlalchemy psycopg2-binary pymysql flytekitplugins-sqlalchemy==$VERSION flytekit==$VERSION
-
-# Copy over the helper script that the SDK relies on
-RUN cp ${VENV}/bin/flytekit_venv /usr/local/bin
-RUN chmod a+x /usr/local/bin/flytekit_venv
-
-# Enable the virtualenv for this image. Note this relies on the VENV variable we've set in this image.
-ENTRYPOINT ["/usr/local/bin/flytekit_venv"]
diff --git a/plugins/flytekit-sqlalchemy/Dockerfile.py3.7 b/plugins/flytekit-sqlalchemy/Dockerfile.py3.7
deleted file mode 100644
index 879656adb5..0000000000
--- a/plugins/flytekit-sqlalchemy/Dockerfile.py3.7
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM python:3.7-slim-buster
-
-WORKDIR /app
-ENV VENV /opt/venv
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-ENV PYTHONPATH /app
-
-RUN pip install awscli
-RUN pip install gsutil
-
-ARG VERSION
-
-# Virtual environment
-RUN python3.7 -m venv ${VENV}
-RUN ${VENV}/bin/pip install wheel
-
-RUN ${VENV}/bin/pip install sqlalchemy psycopg2-binary pymysql flytekitplugins-sqlalchemy==$VERSION flytekit==$VERSION
-
-# Copy over the helper script that the SDK relies on
-RUN cp ${VENV}/bin/flytekit_venv /usr/local/bin
-RUN chmod a+x /usr/local/bin/flytekit_venv
-
-# Enable the virtualenv for this image. Note this relies on the VENV variable we've set in this image.
-ENTRYPOINT ["/usr/local/bin/flytekit_venv"]
diff --git a/plugins/flytekit-sqlalchemy/Dockerfile.py3.8 b/plugins/flytekit-sqlalchemy/Dockerfile.py3.8
deleted file mode 100644
index 93b7048e1b..0000000000
--- a/plugins/flytekit-sqlalchemy/Dockerfile.py3.8
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM python:3.8-slim-buster
-
-WORKDIR /app
-ENV VENV /opt/venv
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-ENV PYTHONPATH /app
-
-RUN pip install awscli
-RUN pip install gsutil
-
-ARG VERSION
-
-# Virtual environment
-RUN python3.8 -m venv ${VENV}
-RUN ${VENV}/bin/pip install wheel
-
-RUN ${VENV}/bin/pip install sqlalchemy psycopg2-binary pymysql flytekitplugins-sqlalchemy==$VERSION flytekit==$VERSION
-
-# Copy over the helper script that the SDK relies on
-RUN cp ${VENV}/bin/flytekit_venv /usr/local/bin
-RUN chmod a+x /usr/local/bin/flytekit_venv
-
-# Enable the virtualenv for this image. Note this relies on the VENV variable we've set in this image.
-ENTRYPOINT ["/usr/local/bin/flytekit_venv"]
diff --git a/plugins/flytekit-sqlalchemy/Dockerfile.py3.9 b/plugins/flytekit-sqlalchemy/Dockerfile.py3.9
deleted file mode 100644
index 039956dcd1..0000000000
--- a/plugins/flytekit-sqlalchemy/Dockerfile.py3.9
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM python:3.9-slim-buster
-
-WORKDIR /app
-ENV VENV /opt/venv
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-ENV PYTHONPATH /app
-
-RUN pip install awscli
-RUN pip install gsutil
-
-ARG VERSION
-
-# Virtual environment
-RUN python3.9 -m venv ${VENV}
-RUN ${VENV}/bin/pip install wheel
-
-RUN ${VENV}/bin/pip install sqlalchemy psycopg2-binary pymysql flytekitplugins-sqlalchemy==$VERSION flytekit==$VERSION
-
-# Copy over the helper script that the SDK relies on
-RUN cp ${VENV}/bin/flytekit_venv /usr/local/bin
-RUN chmod a+x /usr/local/bin/flytekit_venv
-
-# Enable the virtualenv for this image. Note this relies on the VENV variable we've set in this image.
-ENTRYPOINT ["/usr/local/bin/flytekit_venv"]