diff --git a/uwsgi-nginx/Dockerfile b/base/python/3.7-buster-uwsgi-nginx/Dockerfile
similarity index 100%
rename from uwsgi-nginx/Dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/Dockerfile
diff --git a/uwsgi-nginx/README.md b/base/python/3.7-buster-uwsgi-nginx/README.md
similarity index 100%
rename from uwsgi-nginx/README.md
rename to base/python/3.7-buster-uwsgi-nginx/README.md
diff --git a/uwsgi-nginx/app/main.py b/base/python/3.7-buster-uwsgi-nginx/app/main.py
similarity index 100%
rename from uwsgi-nginx/app/main.py
rename to base/python/3.7-buster-uwsgi-nginx/app/main.py
diff --git a/uwsgi-nginx/app/prestart.sh b/base/python/3.7-buster-uwsgi-nginx/app/prestart.sh
similarity index 100%
rename from uwsgi-nginx/app/prestart.sh
rename to base/python/3.7-buster-uwsgi-nginx/app/prestart.sh
diff --git a/uwsgi-nginx/app/uwsgi.ini b/base/python/3.7-buster-uwsgi-nginx/app/uwsgi.ini
similarity index 100%
rename from uwsgi-nginx/app/uwsgi.ini
rename to base/python/3.7-buster-uwsgi-nginx/app/uwsgi.ini
diff --git a/uwsgi-nginx/entrypoint.sh b/base/python/3.7-buster-uwsgi-nginx/entrypoint.sh
similarity index 100%
rename from uwsgi-nginx/entrypoint.sh
rename to base/python/3.7-buster-uwsgi-nginx/entrypoint.sh
diff --git a/uwsgi-nginx/install-nginx-alpine.sh b/base/python/3.7-buster-uwsgi-nginx/install-nginx-alpine.sh
similarity index 100%
rename from uwsgi-nginx/install-nginx-alpine.sh
rename to base/python/3.7-buster-uwsgi-nginx/install-nginx-alpine.sh
diff --git a/uwsgi-nginx/install-nginx-debian.sh b/base/python/3.7-buster-uwsgi-nginx/install-nginx-debian.sh
similarity index 100%
rename from uwsgi-nginx/install-nginx-debian.sh
rename to base/python/3.7-buster-uwsgi-nginx/install-nginx-debian.sh
diff --git a/uwsgi-nginx/python2.7.dockerfile b/base/python/3.7-buster-uwsgi-nginx/python2.7.dockerfile
similarity index 100%
rename from uwsgi-nginx/python2.7.dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/python2.7.dockerfile
diff --git a/uwsgi-nginx/python3.6.dockerfile b/base/python/3.7-buster-uwsgi-nginx/python3.6.dockerfile
similarity index 100%
rename from uwsgi-nginx/python3.6.dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/python3.6.dockerfile
diff --git a/uwsgi-nginx/python3.7.dockerfile b/base/python/3.7-buster-uwsgi-nginx/python3.7.dockerfile
similarity index 100%
rename from uwsgi-nginx/python3.7.dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/python3.7.dockerfile
diff --git a/uwsgi-nginx/python3.8-alpine.dockerfile b/base/python/3.7-buster-uwsgi-nginx/python3.8-alpine.dockerfile
similarity index 100%
rename from uwsgi-nginx/python3.8-alpine.dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/python3.8-alpine.dockerfile
diff --git a/uwsgi-nginx/python3.8.dockerfile b/base/python/3.7-buster-uwsgi-nginx/python3.8.dockerfile
similarity index 100%
rename from uwsgi-nginx/python3.8.dockerfile
rename to base/python/3.7-buster-uwsgi-nginx/python3.8.dockerfile
diff --git a/uwsgi-nginx/start.sh b/base/python/3.7-buster-uwsgi-nginx/start.sh
similarity index 100%
rename from uwsgi-nginx/start.sh
rename to base/python/3.7-buster-uwsgi-nginx/start.sh
diff --git a/uwsgi-nginx/supervisord-alpine.ini b/base/python/3.7-buster-uwsgi-nginx/supervisord-alpine.ini
similarity index 100%
rename from uwsgi-nginx/supervisord-alpine.ini
rename to base/python/3.7-buster-uwsgi-nginx/supervisord-alpine.ini
diff --git a/uwsgi-nginx/supervisord-debian.conf b/base/python/3.7-buster-uwsgi-nginx/supervisord-debian.conf
similarity index 100%
rename from uwsgi-nginx/supervisord-debian.conf
rename to base/python/3.7-buster-uwsgi-nginx/supervisord-debian.conf
diff --git a/uwsgi-nginx/uwsgi.ini b/base/python/3.7-buster-uwsgi-nginx/uwsgi.ini
similarity index 100%
rename from uwsgi-nginx/uwsgi.ini
rename to base/python/3.7-buster-uwsgi-nginx/uwsgi.ini
diff --git a/gh-proxy/Dockerfile b/gh-proxy/Dockerfile
index 6ca1299..896bf2a 100644
--- a/gh-proxy/Dockerfile
+++ b/gh-proxy/Dockerfile
@@ -1,5 +1,5 @@
-FROM stilleshan/uwsgi-nginx:python3.7
-LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
+FROM ioiox/python:3.7-buster-uwsgi-nginx
+LABEL maintainer="Stille <stille@ioiox.com>"
 
 RUN pip install flask requests