diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
index 7f04475..7ba5d56 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -2,27 +2,26 @@
 # Amazon Linux AMI-2018
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: false
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: false
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
index 640f306..4d1ff7f 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -2,27 +2,26 @@
 # Amazon Linux-2
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml
index fb6f431..a26ac5e 100644
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -2,27 +2,26 @@
 # Arch
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - easy-rsa
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - easy-rsa
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml
index 3f1dbc0..39fc299 100644
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -2,27 +2,26 @@
 # CentOS-6
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: false
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: false
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
index b6e1a46..63eb09a 100644
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -2,27 +2,26 @@
 # CentOS Linux-7
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
index cdccc7d..f0f2293 100644
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -2,27 +2,26 @@
 # CentOS Linux-8
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
index 30eabe5..590376d 100644
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -2,35 +2,34 @@
 # Debian-10
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported:
-    - wheezy
-    - jessie
-    - stretch
-    external_repo_version: stable
-    group: openvpn
-    log_user: root
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported:
+  - wheezy
+  - jessie
+  - stretch
+  external_repo_version: stable
+  group: openvpn
+  log_user: root
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
index e6abe97..6596c93 100644
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -2,35 +2,34 @@
 # Debian-9
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported:
-    - wheezy
-    - jessie
-    - stretch
-    external_repo_version: stable
-    group: openvpn
-    log_user: root
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported:
+  - wheezy
+  - jessie
+  - stretch
+  external_repo_version: stable
+  group: openvpn
+  log_user: root
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
index 5f8e221..c91df85 100644
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -2,33 +2,32 @@
 # Fedora-31
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
index d187ce7..a353c5c 100644
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -2,33 +2,32 @@
 # Fedora-32
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
index 447156c..75df932 100644
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -2,33 +2,32 @@
 # Fedora-33
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
index afd2936..477cd1b 100644
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -2,26 +2,25 @@
 # Gentoo-2
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
index 57d4492..022a119 100644
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -2,26 +2,25 @@
 # Gentoo-2
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: false
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: false
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
index 07ca4a5..128439c 100644
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -2,26 +2,25 @@
 # Leap-15
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
index dd2c79f..5dc763b 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -2,27 +2,26 @@
 # Oracle Linux Server-7
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
index b525443..dba9264 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -2,27 +2,26 @@
 # Oracle Linux Server-8
 ---
 values:
-  map:
-    bin_dir: null
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported: []
-    external_repo_version: stable
-    group: openvpn
-    log_user: null
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    - openssl
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported: []
+  external_repo_version: stable
+  group: openvpn
+  log_user: null
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  - openssl
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
index affbfcd..8a37ea5 100644
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -2,35 +2,34 @@
 # Ubuntu-16.04
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported:
-    - precise
-    - trusty
-    - xenial
-    external_repo_version: stable
-    group: openvpn
-    log_user: root
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported:
+  - precise
+  - trusty
+  - xenial
+  external_repo_version: stable
+  group: openvpn
+  log_user: root
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
index 6e93f42..401542b 100644
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -2,35 +2,34 @@
 # Ubuntu-18.04
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported:
-    - precise
-    - trusty
-    - xenial
-    external_repo_version: stable
-    group: openvpn
-    log_user: root
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported:
+  - precise
+  - trusty
+  - xenial
+  external_repo_version: stable
+  group: openvpn
+  log_user: root
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
index e951a20..a873f20 100644
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -2,35 +2,34 @@
 # Ubuntu-20.04
 ---
 values:
-  map:
-    bin_dir: null
-    client:
-      conf_dir: /etc/openvpn/client
-      service: openvpn-client
-    conf_dir: /etc/openvpn
-    conf_ext: conf
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: true
-    external_repo_supported:
-    - precise
-    - trusty
-    - xenial
-    external_repo_version: stable
-    group: openvpn
-    log_user: root
-    manage_group: true
-    manage_user: true
-    multi_services: true
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    server:
-      conf_dir: /etc/openvpn/server
-      service: openvpn-server
-    service: openvpn
-    service_function: running
-    user: openvpn
+  bin_dir: null
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  conf_dir: /etc/openvpn
+  conf_ext: conf
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: true
+  external_repo_supported:
+  - precise
+  - trusty
+  - xenial
+  external_repo_version: stable
+  group: openvpn
+  log_user: root
+  manage_group: true
+  manage_user: true
+  multi_services: true
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
+  service: openvpn
+  service_function: running
+  user: openvpn
diff --git a/test/integration/default/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml
index 4a31a91..8e103cc 100644
--- a/test/integration/default/files/_mapdata/windows-2019-server.yaml
+++ b/test/integration/default/files/_mapdata/windows-2019-server.yaml
@@ -2,24 +2,23 @@
 # Windows-2019Server
 ---
 values:
-  map:
-    bin_dir: C:\Program Files\OpenVPN\bin\
-    conf_dir: C:\Program Files\OpenVPN\config
-    conf_ext: ovpn
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: false
-    external_repo_supported: []
-    external_repo_version: stable
-    group: nobody
-    log_user: null
-    multi_services: false
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    service: OpenVPNService
-    service_function: running
-    user: nobody
+  bin_dir: C:\Program Files\OpenVPN\bin\
+  conf_dir: C:\Program Files\OpenVPN\config
+  conf_ext: ovpn
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: false
+  external_repo_supported: []
+  external_repo_version: stable
+  group: nobody
+  log_user: null
+  multi_services: false
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  service: OpenVPNService
+  service_function: running
+  user: nobody
diff --git a/test/integration/default/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml
index 88163ae..c99a3ff 100644
--- a/test/integration/default/files/_mapdata/windows-8.yaml
+++ b/test/integration/default/files/_mapdata/windows-8.yaml
@@ -2,24 +2,23 @@
 # Windows-8.1
 ---
 values:
-  map:
-    bin_dir: C:\Program Files\OpenVPN\bin\
-    conf_dir: C:\Program Files\OpenVPN\config
-    conf_ext: ovpn
-    dh_files:
-    - '512'
-    dsaparam: false
-    external_repo_enabled: false
-    external_repo_supported: []
-    external_repo_version: stable
-    group: nobody
-    log_user: null
-    multi_services: false
-    network_manager_pkgs:
-    - network-manager-openvpn
-    - network-manager-openvpn-gnome
-    pkgs:
-    - openvpn
-    service: OpenVPNService
-    service_function: running
-    user: nobody
+  bin_dir: C:\Program Files\OpenVPN\bin\
+  conf_dir: C:\Program Files\OpenVPN\config
+  conf_ext: ovpn
+  dh_files:
+  - '512'
+  dsaparam: false
+  external_repo_enabled: false
+  external_repo_supported: []
+  external_repo_version: stable
+  group: nobody
+  log_user: null
+  multi_services: false
+  network_manager_pkgs:
+  - network-manager-openvpn
+  - network-manager-openvpn-gnome
+  pkgs:
+  - openvpn
+  service: OpenVPNService
+  service_function: running
+  user: nobody