diff --git a/.zuul.yaml b/.zuul.yaml
index 526b5e19..8d368a1b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,6 +45,11 @@
     nodes:
       - name: primary
         label: ubuntu-xenial
+- nodeset:
+    name: airship-promenade-single-node-bionic
+    nodes:
+      - name: primary
+        label: ubuntu-bionic
 
 - job:
     name: airship-promenade-genesis-gate
@@ -52,7 +57,7 @@
       Deploy airship promenade genesis
     run: tools/zuul/playbooks/deploy-promenade.yaml
     timeout: 3600
-    nodeset: airship-promenade-single-node
+    nodeset: airship-promenade-single-node-bionic
 
 - job:
     name: airship-promenade-lint-ws
diff --git a/promenade/encryption_method.py b/promenade/encryption_method.py
index bca35a97..f96bde31 100644
--- a/promenade/encryption_method.py
+++ b/promenade/encryption_method.py
@@ -84,7 +84,7 @@ class GPGEncryptionMethod(EncryptionMethod):
         '''
 
     def get_decrypt_command(self):
-        return ('/usr/bin/gpg --verbose --decrypt '
+        return ('/usr/bin/gpg --verbose --decrypt --batch '
                 '--passphrase "${DECRYPTION_KEY}"')
 
     def get_decrypt_teardown_command(self):
diff --git a/promenade/templates/include/up.sh b/promenade/templates/include/up.sh
index a2da2288..ad37fb7f 100644
--- a/promenade/templates/include/up.sh
+++ b/promenade/templates/include/up.sh
@@ -1,6 +1,9 @@
 # Disable overwriting our resolv.conf
 #
-resolvconf --disable-updates
+if [ -h /etc/resolv.conf ]; then
+  log "=== Removing resolv.conf symlink ==="
+  rm -f /etc/resolv.conf
+fi
 
 CURATED_DIRS=(
     /etc/kubernetes