diff --git a/ruff/Dockerfile b/ruff/Dockerfile
index 327851e..1d48426 100644
--- a/ruff/Dockerfile
+++ b/ruff/Dockerfile
@@ -1,14 +1,14 @@
 #################################################################
 FROM ghcr.io/snakepacker/python/all as ruff-builder
 
-RUN python3.11 -m venv /usr/share/python3/app
+RUN python3.13 -m venv /usr/share/python3/app
 RUN /usr/share/python3/app/bin/pip install -U 'ruff'
 
 # Will be find required system libraries and their packages
 RUN find-libdeps /usr/share/python3/app > /usr/share/python3/app/pkgdeps.txt
 
 ########################################################################
-FROM ghcr.io/snakepacker/python/3.11
+FROM ghcr.io/snakepacker/python/3.13
 
 COPY --from=ruff-builder /usr/share/python3/app /usr/share/python3/app
 RUN ln -snf /usr/share/python3/app/bin/ruff /usr/bin/ && mkdir -p /app
diff --git a/uv/Dockerfile b/uv/Dockerfile
index 1fe9164..b62a7f4 100644
--- a/uv/Dockerfile
+++ b/uv/Dockerfile
@@ -1,6 +1,22 @@
-FROM ghcr.io/snakepacker/python/3.12
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+#################################################################
+FROM ghcr.io/snakepacker/python/all as uv-builder
+
+RUN python3.13 -m venv /usr/share/python3/app
+RUN /usr/share/python3/app/bin/pip install -U 'uv'
+
+# Will be find required system libraries and their packages
+RUN find-libdeps /usr/share/python3/app > /usr/share/python3/app/pkgdeps.txt
+
+########################################################################
+FROM ghcr.io/snakepacker/python/3.13
+
+COPY --from=uv-builder /usr/share/python3/app /usr/share/python3/app
+RUN ln -snf /usr/share/python3/app/bin/uv /usr/bin/ && mkdir -p /app
+
+# Install the required library packages
+RUN xargs -ra /usr/share/python3/app/pkgdeps.txt apt-install
 
 WORKDIR /app
 
 ENTRYPOINT ["uv"]
+########################################################################