diff --git a/manifests/user_setup.pp b/manifests/user_setup.pp
index 886ac3e4d..63fab79d1 100644
--- a/manifests/user_setup.pp
+++ b/manifests/user_setup.pp
@@ -55,10 +55,7 @@
 
   # On Debian the service is started by default so it must be configured prior
   # to installation which is why it's configured in this file rather than config.pp
-  $config_hash = merge(
-    $jenkins::params::config_hash_defaults,
-    $jenkins::config_hash
-  )
+  $config_hash = $jenkins::params::config_hash_defaults + $jenkins::config_hash
 
   systemd::dropin_file { 'puppet-overrides.conf':
     unit           => 'jenkins.service',
diff --git a/spec/acceptance/hieradata/os/RedHat.yaml b/spec/acceptance/hieradata/common.yaml
similarity index 56%
rename from spec/acceptance/hieradata/os/RedHat.yaml
rename to spec/acceptance/hieradata/common.yaml
index e2b80fb89..78498f89b 100644
--- a/spec/acceptance/hieradata/os/RedHat.yaml
+++ b/spec/acceptance/hieradata/common.yaml
@@ -1,3 +1,3 @@
 ---
 # Jenkins 2.361.1 requires Java 11 or newer
-java::package: java-11-openjdk-devel
+java::package: java-17-openjdk-devel
diff --git a/spec/acceptance/hieradata/os/Debian.yaml b/spec/acceptance/hieradata/os/Debian.yaml
new file mode 100644
index 000000000..9fecec25f
--- /dev/null
+++ b/spec/acceptance/hieradata/os/Debian.yaml
@@ -0,0 +1,3 @@
+---
+# Jenkins 2.361.1 requires Java 11 or newer
+java::package: openjdk-17-jdk