diff --git a/.travis.yml b/.travis.yml
index 8283685..5f1ee7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 sudo: required
-dist: trusty
+dist: bionic
 
 language: python
 python: "2.7"
diff --git a/defaults/main.yml b/defaults/main.yml
index d26582c..7fbdcb0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Singularity target version
-singularity_version: "3.0.3"
+singularity_version: "3.6.0"
 
 singularity_conf_path: "/usr/local/etc/singularity/singularity.conf"
 
@@ -8,3 +8,6 @@ bind_paths: []
 # example
 # - /shared/home/
 # - /shared/project/
+
+#go variables
+only_one_go_version: false
diff --git a/meta/main.yml b/meta/main.yml
index 26a9c22..ec3925b 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 dependencies:
   - role: gantsign.golang
-    version: 2.0.4
+    version: 2.4.0
 
 galaxy_info:
   role_name: singularity
diff --git a/requirements.yml b/requirements.yml
index 728eeff..71e261b 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,2 +1,2 @@
 - src: gantsign.golang
-  version: 2.0.4
+  version: 2.4.0
diff --git a/tasks/main.yml b/tasks/main.yml
index 8e8a154..16b6b84 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -32,6 +32,22 @@
   changed_when: False
   failed_when: False
 
+- name: singularity | get older go installation(s)
+  find:
+    paths: /opt/go/
+    file_type: directory
+    use_regex: yes
+    patterns: ['^(?!{{ golang_version }})1.[0-9]{1,2}(.[0-9]{1,2}|)$']
+  register: older_go_versions
+  when: only_one_go_version
+
+- name: singularity | remove older Go installation(s)
+  file:
+    path: '{{ item.path }}'
+    state: absent
+  with_items: "{{ older_go_versions.files }}"
+  when: only_one_go_version
+
 - name: singularity | install Go dependencies
   command: go get -u -v github.com/golang/dep/cmd/dep
   environment:
diff --git a/tests/test.yml b/tests/test.yml
index 2bdee16..9bef863 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -12,4 +12,4 @@
     - ../../
   vars:
     golang_gopath: /opt/go/packages
-    singularity_version: "3.0.3"
+    singularity_version: "3.6.0"
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 5b871f7..faf3d19 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -2,10 +2,11 @@
 # Default value for HPC
 singularity_software_base:
   - build-essential
-  - libssl-dev
   - uuid-dev
-  - libgpgme11-dev
+  - libgpgme-dev
   - squashfs-tools
   - libseccomp-dev
+  - wget
   - pkg-config
   - git
+  - cryptsetup-bin
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 176ce87..86dc314 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -2,7 +2,9 @@
 # Default value for HPC
 singularity_software_base:
   - '@Development tools'
-  - openssl-devel
-  - libuuid-devel
-  - gpgme-devel
-  - squashfs-tools
+  -  openssl-devel
+  -  libuuid-devel
+  -  libseccomp-devel
+  -  wget
+  -  squashfs-tools
+  -  cryptsetup
\ No newline at end of file