diff --git a/.sync.yml b/.sync.yml
index 64bd1c524..1d434e337 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,30 +1,10 @@
 ---
 .travis.yml:
-  extras:
-  - rvm: 2.4.1
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
-    services: docker
-    sudo: required
-    bundler_args: --without development
-    dist: trusty
-  - rvm: 2.4.1
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
-    services: docker
-    sudo: required
-    bundler_args: --without development
-    dist: trusty
-  - rvm: 2.4.1
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
-    services: docker
-    sudo: required
-    bundler_args: --without development
-    dist: trusty
-  - rvm: 2.4.1
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
-    services: docker
-    sudo: required
-    bundler_args: --without development
-    dist: trusty
+  docker_sets:
+    - set: docker/ubuntu-14.04
+    - set: docker/ubuntu-16.04
+    - set: docker/centos-7
+    - set: docker/debian-8
   secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
 spec/spec_helper.rb:
   spec_overrides: "require 'spec_helper_methods'"
diff --git a/.travis.yml b/.travis.yml
index 040c82afa..2d2ac3b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,28 +25,28 @@ matrix:
   - rvm: 2.4.3
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.4.1
+  - rvm: 2.4.3
     bundler_args: --without development
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
+    env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/centos-7
     services: docker
     sudo: required
-  - rvm: 2.4.1
+  - rvm: 2.4.3
     bundler_args: --without development
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
+    env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/debian-8
     services: docker
     sudo: required
-  - rvm: 2.4.1
+  - rvm: 2.4.3
     bundler_args: --without development
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
     services: docker
     sudo: required
-  - rvm: 2.4.1
+  - rvm: 2.4.3
     bundler_args: --without development
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
+    env: PUPPET_INSTALL_TYPE=agent CHECK=beaker BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
     services: docker
     sudo: required
 branches: