diff --git a/.zuul.yaml b/.zuul.yaml
index bc45c5b..40d1ca1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,13 +40,14 @@
 
 - job:
     name: airship-images-functional
+    nodeset: airship-images-single-node
     pre-run: playbooks/airship-images-deploy-docker.yaml
     run: playbooks/airship-images-test.yaml
     post-run: playbooks/airship-collect-logs.yaml
-    nodeset: airship-images-single-node
 
 - job:
     name: airship-images-build
+    nodeset: airship-images-single-node
     timeout: 7200
     post-timeout: 7200
     pre-run: playbooks/airship-images-deploy-docker.yaml
@@ -55,6 +56,7 @@
 
 - job:
     name: airship-images-publish
+    nodeset: airship-images-single-node
     timeout: 7200
     post-timeout: 7200
     pre-run: playbooks/airship-images-deploy-docker.yaml
diff --git a/ironic/Makefile b/ironic/Makefile
index e282044..65dc29c 100644
--- a/ironic/Makefile
+++ b/ironic/Makefile
@@ -37,7 +37,7 @@ NO_PROXY             ?= localhost,127.0.0.1,.svc.cluster.local
 USE_PROXY            ?= false
 BASE_IMAGE           ?= docker.io/ubuntu:bionic
 ironic_profiles      ?= "fluent ipxe ipmi qemu tftp"
-ironic_pip_packages  ?= "pycrypto python-openstackclient sushy"
+ironic_pip_packages  ?= "cryptography python-openstackclient sushy"
 ironic_dist_packages ?= "ethtool lshw iproute2"
 
 all: lint images
diff --git a/ironic/build-image.sh b/ironic/build-image.sh
index 3d2f1d2..4755ebf 100755
--- a/ironic/build-image.sh
+++ b/ironic/build-image.sh
@@ -18,7 +18,7 @@ set -e
 : "${base_extra_build_args:="--force-rm --pull --no-cache"}"
 # Defaults for projects
 : "${ironic_profiles:="'fluent ipxe ipmi qemu tftp'"}"
-: "${ironic_pip_packages:="pycrypto python-openstackclient sushy"}"
+: "${ironic_pip_packages:="cryptography python-openstackclient sushy"}"
 : "${ironic_dist_packages:="ethtool lshw iproute2"}"
 # Image tag
 if [ -z "${IMAGE_TAG}" ]; then