diff --git a/roles/enable-fips/tasks/main.yaml b/roles/enable-fips/tasks/main.yaml
index e339ca4be..dc13803a9 100644
--- a/roles/enable-fips/tasks/main.yaml
+++ b/roles/enable-fips/tasks/main.yaml
@@ -17,5 +17,4 @@
 
 - name: Do tasks for Ubuntu
   include_tasks: ubuntu.yaml
-  when: >
-    (ansible_distribution == "Ubuntu")
+  when: ansible_distribution == 'Ubuntu'
diff --git a/roles/enable-fips/tasks/ubuntu.yaml b/roles/enable-fips/tasks/ubuntu.yaml
index d2137852f..9a6db5154 100644
--- a/roles/enable-fips/tasks/ubuntu.yaml
+++ b/roles/enable-fips/tasks/ubuntu.yaml
@@ -4,9 +4,14 @@
     name: ubuntu-advantage-tools
     state: present
 
-- name: Enable fips
+- name: Enable fips and fips-updates
   become: true
-  command: ua enable fips
+  shell: |
+    set -o pipefail
+    yes | ua enable fips
+    echo
+  args:
+    executable: '/bin/bash'
 
 - name: Verify fips is enabled
   become: true