diff --git a/config_defaults.yml b/config_defaults.yml
index aa51a4d1..0f682b13 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -551,10 +551,11 @@ Gemfile:
     #     from_env: BEAKER_RSPEC_VERSION
 .gitlab-ci.yml:
   ruby_versions:
-    - 2.4.1
-    - 2.1.9
+    2.4.1:
+      puppet_version: 5.0
+    2.1.9:
+      puppet_version: 4.0
   variables:
-    PUPPET_GEM_VERSION: "~> 4.0"
     CHECK: spec
   bundler_args: --without system_tests
 spec/default_facts.yml:
diff --git a/moduleroot/.gitlab-ci.yml.erb b/moduleroot/.gitlab-ci.yml.erb
index d534c25c..1436100b 100644
--- a/moduleroot/.gitlab-ci.yml.erb
+++ b/moduleroot/.gitlab-ci.yml.erb
@@ -1,6 +1,6 @@
 ---
 stages:
-<% @configs['ruby_versions'].each do |ruby_version| -%>
+<% @configs['ruby_versions'].each do |ruby_version,hash| -%>
   - test_<%= ruby_version %>
 <% end -%>
 
@@ -13,7 +13,7 @@ before_script:
   - bundle -v
   - bundle install <%= @configs['bundler_args'] %>
 
-<% @configs['ruby_versions'].each do |ruby_version| -%>
+<% @configs['ruby_versions'].each do |ruby_version,hash| -%>
 rubocop-<%= ruby_version %>:
   stage: test_<%= ruby_version %>
   image: ruby:<%= ruby_version %>
@@ -39,6 +39,7 @@ rspec-puppet-<%= ruby_version %>:
 <%   @configs['variables'].each do |key, val| -%>
     <%= key %>: <%= val %>
 <% end -%>
+    PUPPET_GEM_VERSION: '~> <%= hash['puppet_version'] %>'
   script:
     - bundle update
     - bundle exec rake $CHECK