diff --git a/images/horizon/Dockerfile b/images/horizon/Dockerfile
index cb8bca3e..83511e89 100644
--- a/images/horizon/Dockerfile
+++ b/images/horizon/Dockerfile
@@ -13,24 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder as builder
-COPY bindep.txt /tmp/src/bindep.txt
-RUN apt update && apt -y install git
-ADD https://releases.openstack.org/constraints/upper/ussuri /tmp/src/upper-constraints.txt
-RUN assemble git+https://opendev.org/openstack/horizon@stable/ussuri \
-             git+https://opendev.org/openstack/heat-dashboard@stable/ussuri \
-             git+https://opendev.org/openstack/designate-dashboard@stable/ussuri \
-             git+https://opendev.org/openstack/neutron-vpnaas-dashboard@stable/ussuri \
-             git+https://opendev.org/openstack/octavia-dashboard@stable/ussuri \
-             git+https://opendev.org/openstack/sahara-dashboard@stable/ussuri \
-             git+https://opendev.org/openstack/magnum-ui@stable/ussuri \
-             python-memcached
-
-FROM docker.io/opendevorg/uwsgi-base
-COPY --from=builder /output/ /output
-RUN apt update && apt -y install git && \
-    /output/install-from-bindep && \
-    apt -y purge git && apt clean all
+FROM vexxhost/python-builder AS builder
+FROM vexxhost/python-base
 WORKDIR /usr/local/lib/python3.7/site-packages/openstack_dashboard
 RUN ln -s /etc/horizon/local_settings.py local/local_settings.py && \
     cp ../designatedashboard/enabled/*.py enabled/ && \
diff --git a/images/horizon/constraints.txt b/images/horizon/constraints.txt
new file mode 100644
index 00000000..e483a913
--- /dev/null
+++ b/images/horizon/constraints.txt
@@ -0,0 +1 @@
+--constraint https://releases.openstack.org/constraints/upper/ussuri
diff --git a/images/horizon/requirements.txt b/images/horizon/requirements.txt
new file mode 100644
index 00000000..40804ca5
--- /dev/null
+++ b/images/horizon/requirements.txt
@@ -0,0 +1,9 @@
+uWSGI
+python-memcached
+git+https://opendev.org/openstack/horizon@stable/ussuri
+git+https://opendev.org/openstack/heat-dashboard@stable/ussuri
+git+https://opendev.org/openstack/designate-dashboard@stable/ussuri
+git+https://opendev.org/openstack/neutron-vpnaas-dashboard@stable/ussuri
+git+https://opendev.org/openstack/octavia-dashboard@stable/ussuri
+git+https://opendev.org/openstack/sahara-dashboard@stable/ussuri
+git+https://opendev.org/openstack/magnum-ui@stable/ussuri