diff --git a/meta/main.yml b/meta/main.yml
index 1d62bf8..77c1001 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,10 +11,10 @@ galaxy_info:
     - name: EL
       versions:
         - 7
-    #- name: Ubuntu
-    #  versions:
-    #    - xenial
-    #    - bionic
+  # - name: Ubuntu
+  #   versions:
+  #     - xenial
+  #     - bionic
   galaxy_tags:
     - system
     - cloud
@@ -24,9 +24,9 @@ galaxy_info:
     - ec2
 
 dependencies: []
-  # TODO: Currently work only on CentOS 7 with a specific XRT package
-  #- role: accelize.xilinx_xrt
-  #  when: aws_fpga_xrt | bool
-  #  vars:
-  #    xilinx_xrt_aws: true
-  #    xilinx_xrt_version: 2018.3
+#  TODO: Currently work only on CentOS 7 with a specific XRT package
+#  - role: accelize.xilinx_xrt
+#   when: aws_fpga_xrt | bool
+#   vars:
+#     xilinx_xrt_aws: true
+#     xilinx_xrt_version: 2018.3
diff --git a/tasks/main.yml b/tasks/main.yml
index 9fdcc5a..ccdd8e8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -68,6 +68,7 @@
   package:
     name:
       - "kernel-devel-{{ ansible_kernel }}"
+      - "kernel-headers-{{ ansible_kernel }}"
       - elfutils-libelf-devel
     state: present
   retries: 10
@@ -100,6 +101,7 @@
     - "/usr/sbin/modprobe {{ aws_fpga_driver }}"
   when: aws_fpga_driver != '' and not libfpga_mgmt.stat.exists
 
+# Force the use of as specific XRT, because it is the only version that work
 - name: Download xrt/xrt-aws packages
   get_url:
     url: "{{ s3_dev_ami_url }}{{ aws_xrt_package }}-{{ item }}.rpm"
@@ -115,6 +117,7 @@
   package:
     name:
       - "kernel-devel-{{ ansible_kernel }}"
+      - "kernel-headers-{{ ansible_kernel }}"
       - epel-release
     state: present
   retries: 10