diff --git a/packer/provision/baseline.yaml b/packer/provision/baseline.yaml
index 2c43ecf..8aacecd 100644
--- a/packer/provision/baseline.yaml
+++ b/packer/provision/baseline.yaml
@@ -19,7 +19,7 @@
           Defaults:jenkins !requiretty
           jenkins ALL = NOPASSWD: /usr/sbin/update-alternatives, /usr/sbin/update-java-alternatives
         validate: /usr/sbin/visudo -cf %s
-      become: yes
+      become: true
 
   roles:
     - lfit.lf-recommended-tools
@@ -39,8 +39,8 @@
         path: /etc/nsswitch.conf
         regexp: '^hosts:(\s+.*)?$'
         replace: 'hosts:\1 myhostname'
-        backup: yes
-      become: yes
+        backup: true
+      become: true
 
     - name: Disable periodic updates
       block:
@@ -59,7 +59,7 @@
             path: /etc/apt/apt.conf.d/10periodic
             regexp: "^APT::Periodic::Unattended-Upgrade"
             line: 'APT::Periodic::Unattended-Upgrade "0";'
-            create: yes
+            create: true
         - name: Uninstall unattended upgrades
           apt:
             name: unattended-upgrades
@@ -71,8 +71,8 @@
         - name: Disable apt-daily.* systemd services
           systemd:
             name: "{{service}}"
-            enabled: no
-            masked: yes
+            enabled: false
+            masked: true
           with_items:
             - apt-daily.service
             - apt-daily.timer
@@ -81,7 +81,7 @@
           loop_control:
             loop_var: service
       when: ansible_distribution == 'Ubuntu'
-      become: yes
+      become: true
 
     - name: System Reseal
       script: system-reseal.sh
diff --git a/packer/provision/install-base-pkgs-Ubuntu.yaml b/packer/provision/install-base-pkgs-Ubuntu.yaml
index 2ab6308..bd603d8 100644
--- a/packer/provision/install-base-pkgs-Ubuntu.yaml
+++ b/packer/provision/install-base-pkgs-Ubuntu.yaml
@@ -12,4 +12,4 @@
       - equivs
       - gdebi
     state: latest
-  become: yes
+  become: true
diff --git a/packer/provision/onf-playbook.yaml b/packer/provision/onf-playbook.yaml
index a30a228..6114c7c 100644
--- a/packer/provision/onf-playbook.yaml
+++ b/packer/provision/onf-playbook.yaml
@@ -76,14 +76,14 @@
       unarchive:
         src: "/tmp/helm.tgz"
         dest: "/tmp"
-        remote_src: yes
+        remote_src: true
 
     - name: Install helm binary
       copy:
         src: /tmp/linux-amd64/helm
         dest: /usr/local/bin/helm
         mode: "0755"
-        remote_src: yes
+        remote_src: true
 
     - name: Download/install kubectl binary
       get_url:
@@ -131,29 +131,29 @@
     - name: Install multi python2 packages with version specifiers
       pip:
         name:
-        - Jinja2
-        - coverage
-        - certifi
-        - cryptography
-        - git+https://github.com/linkchecker/linkchecker.git@v9.4.0
-        - graphviz
-        - isort
-        - more-itertools==5.0.0
-        - mock>2.0.0<2.1.0
-        - ndg-httpsclient
-        - nose2>0.9.0<0.10.0
-        - pyopenssl
-        - pexpect
-        - pyyaml>3.10.0<3.11.0
-        - requests>2.14.0<2.15.0
-        - robotframework
-        - robotframework-httplibrary
-        - robotframework-kafkalibrary
-        - robotframework-lint
-        - robotframework-requests
-        - robotframework-sshlibrary
-        - six
-        - urllib3
+          - Jinja2
+          - coverage
+          - certifi
+          - cryptography
+          - git+https://github.com/linkchecker/linkchecker.git@v9.4.0
+          - graphviz
+          - isort
+          - more-itertools==5.0.0
+          - mock>2.0.0<2.1.0
+          - ndg-httpsclient
+          - nose2>0.9.0<0.10.0
+          - pyopenssl
+          - pexpect
+          - pyyaml>3.10.0<3.11.0
+          - requests>2.14.0<2.15.0
+          - robotframework
+          - robotframework-httplibrary
+          - robotframework-kafkalibrary
+          - robotframework-lint
+          - robotframework-requests
+          - robotframework-sshlibrary
+          - six
+          - urllib3
 
     - name: Install multi ruby packages with version specifiers
       gem:
@@ -195,7 +195,7 @@
       unarchive:
         src: "/tmp/protobuf.zip"
         dest: "/usr/local"
-        remote_src: yes
+        remote_src: true
 
     - name: Download pandoc
       get_url:
@@ -247,7 +247,7 @@
         src: /tmp/github-release
         dest: /usr/local/bin/github-release
         mode: "0755"
-        remote_src: yes
+        remote_src: true
 
     - name: Recursively remove download files and folders
       file: