diff --git a/manifests/install.pp b/manifests/install.pp
index cfa14ba..61bc2c3 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -8,47 +8,58 @@
 
   $bin_file = "${caddy::install_path}/caddy"
 
-  if $caddy::install_method == 'github' {
-    $caddy_url    = 'https://github.com/caddyserver/caddy/releases/download'
-    $caddy_dl_url = "${caddy_url}/v${caddy::version}/caddy_${caddy::version}_linux_${caddy::arch}.tar.gz"
-    $caddy_dl_dir = "/var/cache/caddy_${caddy::version}_linux_${$caddy::arch}.tar.gz"
+  case $caddy::install_method {
+    'github': {
+      $caddy_url    = 'https://github.com/caddyserver/caddy/releases/download'
+      $caddy_dl_url = "${caddy_url}/v${caddy::version}/caddy_${caddy::version}_linux_${caddy::arch}.tar.gz"
+      $caddy_dl_dir = "/var/cache/caddy_${caddy::version}_linux_${$caddy::arch}.tar.gz"
 
-    $extract_path = "/var/cache/caddy-${caddy::version}"
+      $extract_path = "/var/cache/caddy-${caddy::version}"
 
-    file { $extract_path:
-      ensure => directory,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0755',
-    }
+      file { $extract_path:
+        ensure => directory,
+        owner  => 'root',
+        group  => 'root',
+        mode   => '0755',
+      }
+
+      archive { $caddy_dl_dir:
+        ensure       => present,
+        extract      => true,
+        extract_path => $extract_path,
+        source       => $caddy_dl_url,
+        username     => $caddy::caddy_account_id,
+        password     => $caddy::caddy_api_key,
+        user         => 'root',
+        group        => 'root',
+        require      => File[$extract_path],
+        before       => File[$bin_file],
+      }
 
-    archive { $caddy_dl_dir:
-      ensure       => present,
-      extract      => true,
-      extract_path => $extract_path,
-      source       => $caddy_dl_url,
-      username     => $caddy::caddy_account_id,
-      password     => $caddy::caddy_api_key,
-      user         => 'root',
-      group        => 'root',
-      require      => File[$extract_path],
-      before       => File[$bin_file],
+      $caddy_source = "/var/cache/caddy-${caddy::version}/caddy"
     }
+    default: {
+      $caddy_url    = 'https://caddyserver.com/api/download'
+      $query_params = {
+        os        => 'linux',
+        arch      => $caddy::arch,
+        plugins   => $caddy::caddy_features,
+        license   => $caddy::caddy_license,
+        telemetry => $caddy::caddy_telemetry,
+      }.map |$k, $v| { "${k}=${v}" }.join('&')
 
-    $caddy_source = "/var/cache/caddy-${caddy::version}/caddy"
-  } else {
-    $caddy_url    = 'https://caddyserver.com/api/download'
-    $caddy_dl_url = "${caddy_url}?os=linux&arch=${caddy::arch}&plugins=${caddy::caddy_features}&license=${caddy::caddy_license}&telemetry=${caddy::caddy_telemetry}"
+      $caddy_dl_url = "${caddy_url}?${query_params}"
 
-    $caddy_source = '/var/cache/caddy-latest'
+      $caddy_source = '/var/cache/caddy-latest'
 
-    file { $caddy_source:
-      ensure  => file,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0755',
-      source  => $caddy_dl_url,
-      replace => false, # Don't download the file on every run
+      file { $caddy_source:
+        ensure  => file,
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0755',
+        source  => $caddy_dl_url,
+        replace => false, # Don't download the file on every run
+      }
     }
   }