diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml
index 02ae886649..9ba0320268 100644
--- a/jenkins/jobs/heat.yaml
+++ b/jenkins/jobs/heat.yaml
@@ -58,13 +58,13 @@
           services+=,g-api,g-reg
           services+=,c-sch,c-api,c-vol,c-bak
           services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-          services+=,s-proxy,s-object,s-container,s-account
 
           if [ "{special}" == "-py35" ] ; then
              export DEVSTACK_GATE_USE_PYTHON3=True
-             export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_python3_package swift"
+             # Swift does not work so skip s-* for python3x for now
           else
              export DEVSTACK_GATE_USE_PYTHON3=False
+             services+=,s-proxy,s-object,s-container,s-account
           fi
 
           # enable heat services for mitaka (no devstack plugin available)