diff --git a/virtuoso/defaults/main.yml b/virtuoso/defaults/main.yml
index e4db489e..4be6a095 100644
--- a/virtuoso/defaults/main.yml
+++ b/virtuoso/defaults/main.yml
@@ -41,7 +41,7 @@ virtuoso_set_more_ini_opts: False
 #virtuoso_more_ini_opts:
  
 virtuoso_pkg_list:
-  - virtuoso-opensource
+  - 'virtuoso-opensource-{{ virtuoso_version }}'
   - virtuoso-server
   - virtuoso-vad-isparql
   - virtuoso-vad-bpel
diff --git a/virtuoso/tasks/virtuoso-pkgs.yml b/virtuoso/tasks/virtuoso-pkgs.yml
index 510f04e7..c0c6d3ad 100644
--- a/virtuoso/tasks/virtuoso-pkgs.yml
+++ b/virtuoso/tasks/virtuoso-pkgs.yml
@@ -16,10 +16,11 @@
 
 - name: Install the virtuoso packages
   apt: name={{ item }} state={{ virtuoso_pkg_state }}
-  with_items: virtuoso_pkg_list
+  with_items: '{{ virtuoso_pkg_list }}'
   tags: virtuoso
 
 - name: Install the virtuoso optional packages
   apt: name={{ item }} state={{ virtuoso_pkg_state }}
-  with_items: virtuoso_optional_pkgs
+  with_items: '{{ virtuoso_optional_pkgs }}'
+  when: virtuoso_install_optional_pkgs
   tags: virtuoso