diff --git a/playbooks/release/tag.yaml b/playbooks/release/tag.yaml
index b01182eb0a..72f127ef6d 100644
--- a/playbooks/release/tag.yaml
+++ b/playbooks/release/tag.yaml
@@ -1,24 +1,24 @@
 - hosts: all
   tasks:
     - name: Run release scripts
-      shell: |
-        set -x
+      shell:
+        cmd: |
+          set -x
 
-        RELEASES_DIR=$HOME/src/{{ zuul.project.canonical_name }}
-        # Tell the launchpad script run from release.sh where its
-        # credentials file is.
-        export LP_CREDS_FILE=~/.launchpadlib/creds
+          RELEASES_DIR=$HOME/src/{{ zuul.project.canonical_name }}
+          # Tell the launchpad script run from release.sh where its
+          # credentials file is.
+          export LP_CREDS_FILE=~/.launchpadlib/creds
 
-        # Pass the location of the openstack/releases repo to
-        # release_from_yaml.sh explicitly so it knows where to scan to
-        # look for modified files.
-        ~/scripts/release-tools/release_from_yaml.sh $RELEASES_DIR
-        RC1=$?
+          # Pass the location of the openstack/releases repo to
+          # release_from_yaml.sh explicitly so it knows where to scan to
+          # look for modified files.
+          ~/scripts/release-tools/release_from_yaml.sh $RELEASES_DIR
+          RC1=$?
 
-        # After we have tagged, create any new branches.
-        ~/scripts/release-tools/branch_from_yaml.sh $RELEASES_DIR
-        RC2=$?
+          # After we have tagged, create any new branches.
+          ~/scripts/release-tools/branch_from_yaml.sh $RELEASES_DIR
+          RC2=$?
 
-        exit $(($RC1 + $RC2))
-      args:
+          exit $(($RC1 + $RC2))
         executable: /bin/bash
diff --git a/roles/build-wheels/tasks/main.yaml b/roles/build-wheels/tasks/main.yaml
index 28e656b247..9c0a259f86 100644
--- a/roles/build-wheels/tasks/main.yaml
+++ b/roles/build-wheels/tasks/main.yaml
@@ -11,6 +11,6 @@
   become: yes
 
 - name: Build the wheel mirror
-  shell: ./scripts/wheel-build.sh {{ wheel_dir }} {{ wheel_python }}
-  args:
+  shell:
+    cmd: ./scripts/wheel-build.sh {{ wheel_dir }} {{ wheel_python }}
     executable: /bin/bash