diff --git a/tasks/barbican_install_apt.yml b/tasks/barbican_install_apt.yml
index 1f4a918..7ece817 100644
--- a/tasks/barbican_install_apt.yml
+++ b/tasks/barbican_install_apt.yml
@@ -29,4 +29,4 @@
   until: install_barbican_apt_packages |success
   retries: 5
   delay: 2
-  with_items: barbican_apt_packages
+  with_items: "{{ barbican_apt_packages }}"
diff --git a/tasks/install.yml b/tasks/install.yml
index c81bca5..bda8e1f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -87,7 +87,7 @@
   until: install_barbican_pip_packages |success
   retries: 5
   delay: 2
-  with_items: barbican_pip_packages
+  with_items: "{{ barbican_pip_packages }}"
   tags:
     - barbican-install
     - barbican-pip-packages
diff --git a/tasks/main.yml b/tasks/main.yml
index 5a2936d..8b74771 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -44,10 +44,8 @@
 
 - name: Restart Barbican Services
   service:
-    name: "{{ item }}"
+    name: "{{ barbican_uwsgi_program_name }}"
     state: "restarted"
-  with_items:
-    - "{{ barbican_uwsgi_program_name }}"
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/tasks/service-setup.yml b/tasks/service-setup.yml
index c5ba600..99e24e2 100644
--- a/tasks/service-setup.yml
+++ b/tasks/service-setup.yml
@@ -69,7 +69,7 @@
   until: ensure_barbican_roles |success
   retries: 5
   delay: 2
-  with_items: barbican_service_role_names
+  with_items: "{{ barbican_service_role_names }}"
   tags:
     - barbican-api-setup
     - barbican-role-setup
diff --git a/tests/test-barbican-functional.yml b/tests/test-barbican-functional.yml
index 35c1bbf..07c3b85 100644
--- a/tests/test-barbican-functional.yml
+++ b/tests/test-barbican-functional.yml
@@ -41,7 +41,7 @@
     - name: Register secret location
       set_fact:
         secret_ref: "{{ item.split('|')[2] }}"
-      with_items: barbican_secret_store.stdout_lines
+      with_items: "{{ barbican_secret_store.stdout_lines }}"
       when: item.find('Secret href') != -1
     - name: Retrieve test secret
       shell: |