diff --git a/.ci/integration/gnupg-git/default.yml b/.ci/integration/gnupg-git/default.yml
index 38f6e416..5b292738 100644
--- a/.ci/integration/gnupg-git/default.yml
+++ b/.ci/integration/gnupg-git/default.yml
@@ -70,52 +70,32 @@
       when:
         - ansible_os_family == "RedHat"
 
-    - name: Get GnuPG github api content
-      uri:
-        url: https://api.github.com/repos/gpg/gnupg/tags
-        method: GET
-        return_content: yes
-        body_format: json
-      register: gnupg_tags
-
-    - name: Set url for latest gnupg release source
-      set_fact:
-        gnupg_tarball_url: >-
-          {{
-            gnupg_tags.json |
-            selectattr('name','match','gnupg-2.*') |
-            map(attribute='tarball_url') | first
-          }}
-
-    - name: Download latest release of gnupg source
-      get_url:
-        url: "{{ gnupg_tarball_url }}"
-        dest: /tmp/gnupg.tar.gz
-        force: yes
-      retries: 5
-      delay: 10
-
     - name: Make directory /usr/local/src/ for Alpine based distros
       command: bash -lc "mkdir -p /usr/local/src/"
       when:
         - ansible_os_family == "Alpine"
 
-    - name: Extract gnupg source tarball
-      unarchive:
-        src: /tmp/gnupg.tar.gz
-        dest: /usr/local/src/
-
-    - name: Find gnupg src directory
-      find:
-        paths: /usr/local/src
-        patterns: "gpg-gnupg*"
-        file_type: directory
-        recurse: no
-      register: found_gpg_src
-
     - name: Set gnupg src directory
       set_fact:
-        gpg_src_path: "{{ found_gpg_src.files | map(attribute='path') | first }}"
+        gpg_src_path: /usr/local/src/gpg-gnupg
+
+    - name: Get GnuPG from github
+      git:
+        repo: 'https://github.com/gpg/gnupg.git'
+        dest: "{{ gpg_src_path }}"
+        update: true
+
+    - name: get latest tag name
+      shell: "git describe --tags `git rev-list --tags --max-count=1`"
+      args:
+        chdir: "{{ gpg_src_path }}"
+      register: latest_tag
+
+    - name: Checkout latest tag
+      git:
+        repo: 'https://github.com/gpg/gnupg.git'
+        dest: "{{ gpg_src_path }}"
+        version: "{{ latest_tag.stdout }}"
 
     - name: Run gnupg autogen
       command: bash -lc "cd {{ gpg_src_path }} && ./autogen.sh "
diff --git a/.kitchen.yml b/.kitchen.yml
index eedcfdc0..83885bfc 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -25,13 +25,11 @@ transport:
   max_ssh_sessions: 3
 
 platforms:
-  - name: debian-latest
+  - name: alpine-latest
     driver_config:
-      run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/debian/latest/Dockerfile
-      platform: debian
-      cap_add:
-        - SYS_ADMIN
+      run_command: /sbin/init
+      dockerfile: .Dockerfiles/alpine/latest/Dockerfile
+      platform: alpine
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
         - <%=ENV['PWD']%>:/opt/workspace # Make the working directory available inside the container
@@ -40,11 +38,11 @@ platforms:
           - /run
           - /run/lock
 
-  - name: fedora-latest
+  - name: debian-latest
     driver_config:
       run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/fedora/latest/Dockerfile
-      platform: fedora
+      dockerfile: .Dockerfiles/debian/latest/Dockerfile
+      platform: debian
       cap_add:
         - SYS_ADMIN
       volume:
@@ -55,11 +53,11 @@ platforms:
           - /run
           - /run/lock
 
-  - name: centos-latest
+  - name: fedora-latest
     driver_config:
       run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/centos/latest/Dockerfile
-      platform: centos
+      dockerfile: .Dockerfiles/fedora/latest/Dockerfile
+      platform: fedora
       cap_add:
         - SYS_ADMIN
       volume:
@@ -100,19 +98,6 @@ platforms:
           - /run
           - /run/lock
 
-  - name: alpine-latest
-    driver_config:
-      run_command: /sbin/init
-      dockerfile: .Dockerfiles/alpine/latest/Dockerfile
-      platform: alpine
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-        - <%=ENV['PWD']%>:/opt/workspace # Make the working directory available inside the container
-      run_options:
-        tmpfs:
-          - /run
-          - /run/lock
-
 verifier:
   name: serverspec
   sudo_path: true
diff --git a/.travis.yml b/.travis.yml
index 96a938c7..86036763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,6 @@ dist: xenial
 matrix:
   fast_finish: true
   include:
-    - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
-      services: docker
-      sudo: required
-      language: ruby
-      rvm: 2.6
     - os: linux
       env: KITCHEN_REGEXP="gnupg1-alpine-latest"
       services: docker
@@ -45,12 +39,14 @@ matrix:
       sudo: required
       language: ruby
       rvm: 2.6
+    # distribute deb on this successful test
     - os: linux
       env: KITCHEN_REGEXP="gnupg2-debian-latest"; GITSECRET_DIST="deb"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.6
+    # distribute rpm on this successful test
     - os: linux
       env: KITCHEN_REGEXP="gnupg2-fedora-latest"; GITSECRET_DIST="rpm"
       services: docker
@@ -58,7 +54,7 @@ matrix:
       language: ruby
       rvm: 2.6
     - os: linux
-      env: KITCHEN_REGEXP="gnupg2-centos-latest"
+      env: KITCHEN_REGEXP="gnupg2-ubuntu-latest"
       services: docker
       sudo: required
       language: ruby
@@ -70,7 +66,19 @@ matrix:
       language: ruby
       rvm: 2.6
     - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-debian-latest"; GITSECRET_DIST="make"
+      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
+      services: docker
+      sudo: required
+      language: ruby
+      rvm: 2.6
+    - os: linux
+      env: KITCHEN_REGEXP="gnupg-git-debian-latest";
+      services: docker
+      sudo: required
+      language: ruby
+      rvm: 2.6
+    - os: linux
+      env: KITCHEN_REGEXP="gnupg-git-ubuntu-latest"
       services: docker
       sudo: required
       language: ruby