diff --git a/.zuul.yaml b/.zuul.yaml
index 37e0e07e91..008d42df41 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -177,7 +177,6 @@
     name: magnum-functional-swarm-mode
     parent: magnum-functional-coe
     voting: false
-    branches: ^(?!stable/(newton|ocata)).*$
     vars:
       coe: swarm-mode
     irrelevant-files:
@@ -195,7 +194,6 @@
     name: magnum-functional-dcos
     parent: magnum-functional-coe
     voting: false
-    branches: ^(?!stable/(newton|ocata)).*$
     vars:
       coe: dcos
     irrelevant-files:
@@ -296,7 +294,6 @@
     name: magnum-functional-swarm-mode-multinode
     parent: magnum-functional-multinode-base
     voting: false
-    branches: ^(?!stable/(newton|ocata)).*$
     vars:
       coe: swarm-mode
     irrelevant-files:
diff --git a/dockerfiles/heat-container-agent/Dockerfile b/dockerfiles/heat-container-agent/Dockerfile
index 76402f1ee0..1d6d4887fb 100644
--- a/dockerfiles/heat-container-agent/Dockerfile
+++ b/dockerfiles/heat-container-agent/Dockerfile
@@ -57,7 +57,7 @@ RUN /tmp/write-os-apply-config-templates.sh
 
 COPY manifest.json service.template config.json.template tmpfiles.template /exports/
 
-RUN ln -s /usr/bin/python3 /usr/bin/python
+RUN if [ ! -f /us/bin/python ]; then ln -s /usr/bin/python3 /usr/bin/python; fi
 
 COPY launch /usr/bin/start-heat-container-agent