diff --git a/.zuul.yaml b/.zuul.yaml
index 781afa2d6..548d014b4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -171,23 +171,14 @@
             # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ].  Only works for 3-component tags.
             # Otherwise: ['latest']
             &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
-          arch:
-            - linux/amd64
-            - linux/arm64
         - context: .
           repository: zuul/nodepool-launcher
           target: nodepool-launcher
           tags: *imagetag
-          arch:
-            - linux/amd64
-            - linux/arm64
         - context: .
           repository: zuul/nodepool-builder
           target: nodepool-builder
           tags: *imagetag
-          arch:
-            - linux/amd64
-            - linux/arm64
 
 - job:
     name: nodepool-upload-image
diff --git a/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2 b/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2
index 95a633bf2..dc6ee75c6 100644
--- a/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2
+++ b/playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2
@@ -21,6 +21,8 @@ services:
       - /home/zuul:/home/zuul
       # logs (builder + dib build logs under /build)
       - /var/log/nodepool:/var/log/nodepool
+      # devstack tls-proxy puts CA here that is referenced by cloud config
+      - /opt/stack/data:/opt/stack/data:ro
 
   nodepool-launcher:
     image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }}
@@ -37,3 +39,5 @@ services:
       - /etc/nodepool:/etc/nodepool:ro
       # logs (builder + dib build logs under /build)
       - /var/log/nodepool:/var/log/nodepool
+      # devstack tls-proxy puts CA here that is referenced by cloud config
+      - /opt/stack/data:/opt/stack/data:ro