diff --git a/.travis.yml b/.travis.yml
index e5916df..4f38882 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,10 +44,10 @@ env:
     init: /sbin/init
     run_opts: --privileged
     playbook: test.yml
-#  - distro: yakkety
-#    init: /sbin/init
-#    run_opts: --privileged
-#    playbook: test.yml
+  - distro: yakkety
+    init: /sbin/init
+    run_opts: --privileged
+    playbook: test.yml
   - distro: zesty
     init: /sbin/init
     run_opts: --privileged
@@ -100,6 +100,10 @@ env:
     init: /usr/lib/systemd/systemd
     run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
     playbook: test.yml
+  - distro: fedora-28
+    init: /usr/lib/systemd/systemd
+    run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
+    playbook: test.yml
 
 before_install:
 
diff --git a/meta/main.yml b/meta/main.yml
index 6aa88c2..da29b9a 100755
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -20,6 +20,7 @@ galaxy_info:
         - 25
         - 26
         - 27
+        - 28
     - name: Ubuntu
       versions:
         - precise
@@ -31,7 +32,7 @@ galaxy_info:
         - wily
         - vivid
         - xenial
-#        - yakkety
+        - yakkety
         - zesty
         - artful
         - bionic
diff --git a/tasks/install.yml b/tasks/install.yml
index 1aed49d..2610b6c 100755
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: "Go-Lang | Include bootstrap tasks"
-  include: install-bootstrap.yml
+  include_tasks: install-bootstrap.yml
   when:
     (install_go_bootstrap|bool == true) and
     ((go_binary_bootstrap.stat.exists|bool == false) or
@@ -10,14 +10,14 @@
     (GOROOT_BOOTSTRAP is defined)
 
 - name: "Go-Lang | Include source build tasks"
-  include: install-git.yml
+  include_tasks: install-git.yml
   when:
     (build_go_from_source|bool == true) and
     ((expected_go_version_output|string not in current_go_version.stdout|default('')) or
     (go_install_clean|bool == true))
 
 - name: "Go-Lang | Include distro install tasks"
-  include: install-distro.yml
+  include_tasks: install-distro.yml
   when:
     (build_go_from_source|bool == false) and
     ((expected_go_version_output|string not in current_go_version.stdout|default('')) or
diff --git a/tasks/main.yml b/tasks/main.yml
index 82fa591..a52a7a0 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,29 +2,29 @@
 # main tasks file for fubarhouse-golang
 
 - name: "Include tasks gathering system information"
-  include: setup.yml
+  include_tasks: setup.yml
 
 - name: "Include tasks to clean installation"
-  include: cleanup.yml
+  include_tasks: cleanup.yml
   when: go_install_clean|bool == true
 
 - name: "Include tasks for installation"
-  include: install.yml
+  include_tasks: install.yml
   when: ((current_go_version is not defined) or
         (expected_go_version_output|string not in current_go_version.stdout|default('')) or
         (go_install_clean|bool == true)) and
         (go_uninstall|bool == false)
 
 - name: "Include tasks for Go Get"
-  include: go-get.yml
+  include_tasks: go-get.yml
   when: (go_get.0 is defined) and
         (go_uninstall|bool == false)
 
 - name: "Include tasks for Go Install"
-  include: go-install.yml
+  include_tasks: go-install.yml
   when: (go_install.0 is defined) and
         (go_uninstall|bool == false)
 
 - name: "Include tasks for setting Go permissions"
-  include: perm.yml
+  include_tasks: perm.yml
   when: go_uninstall|bool == false
\ No newline at end of file
diff --git a/tasks/setup.yml b/tasks/setup.yml
index e765ae5..6b0299d 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -22,23 +22,23 @@
   when: fubarhouse_user_dir is not defined
 
 - name: "Go-Lang | Include OS-Specific tasks (CentOS)"
-  include: tasks-CentOS.yml
+  include_tasks: tasks-CentOS.yml
   when: ansible_distribution == "CentOS"
 
 - name: "Go-Lang | Include OS-Specific tasks (Darwin)"
-  include: tasks-Darwin.yml
+  include_tasks: tasks-Darwin.yml
   when: ansible_os_family == 'Darwin'
 
 - name: "Go-Lang | Include OS-Specific tasks (Debian)"
-  include: tasks-Debian.yml
+  include_tasks: tasks-Debian.yml
   when: ansible_os_family == "Debian"
 
 - name: "Go-Lang | Include OS-Specific tasks (FreeBSD)"
-  include: tasks-Debian.yml
+  include_tasks: tasks-Debian.yml
   when: ansible_distribution == 'FreeBSD'
 
 - name: "Go-Lang | Include OS-Specific tasks (RedHat)"
-  include: tasks-RedHat.yml
+  include_tasks: tasks-RedHat.yml
   when:
     - ansible_os_family == "RedHat"
     - ansible_distribution != "CentOS"