diff --git a/ansible/roles/kolla/tasks/install.yml b/ansible/roles/kolla/tasks/install.yml
index 09cbeb9ef..33512762d 100644
--- a/ansible/roles/kolla/tasks/install.yml
+++ b/ansible/roles/kolla/tasks/install.yml
@@ -67,7 +67,9 @@
     version: "{{ item.version | default(omit) }}"
     state: "{{ item.state | default('present') }}"
     virtualenv: "{{ kolla_venv }}"
-    extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
+    extra_args: "{{ item.extra_args | default(default_extra_args) }}"
+  vars:
+    default_extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
   with_items:
     # Install Kolla from source.
     - name: "{{ kolla_source_path }}"
@@ -77,5 +79,10 @@
       version: "{{ kolla_openstack_release }}"
       install: "{{ kolla_ctl_install_type == 'binary' }}"
     # Install docker from PyPI since it was dropped from kolla requirements.
-    - name: "docker"
+    # Skip 7.0.0 due to: https://github.com/docker/docker-py/issues/3195
+    - name: "docker!=7.0.0,<8"
+      # NOTE(wszumski): Workaround for ERROR: ResolutionImpossible when using upper constraints.
+      # This can be removed once a newer version of docker is released and the version in upper
+      # constraints has been bumped (>7.0.0).
+      extra_args: "{{ omit }}"
   when: item.install | default(True) | bool
diff --git a/releasenotes/notes/fix-issue-building-images-when-docker-registry-contains-port-356dbaeeb8dd1e29.yaml b/releasenotes/notes/fix-issue-building-images-when-docker-registry-contains-port-356dbaeeb8dd1e29.yaml
new file mode 100644
index 000000000..a9753ad89
--- /dev/null
+++ b/releasenotes/notes/fix-issue-building-images-when-docker-registry-contains-port-356dbaeeb8dd1e29.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes issue building container images when docker registry contained a
+    port.  See `LP#2054715 <https://bugs.launchpad.net/kayobe/+bug/2054715>`__
+    for more details.
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 91ec9bc76..05cf9b835 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -221,7 +221,6 @@
       Base job for testing seed image builds.
 
       Configures the primary VM as a seed.
-    voting: false
     vars:
       build_images: true