diff --git a/linux/map.jinja b/linux/map.jinja
index e60f00d..d5c957b 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -159,7 +159,7 @@
     'arp_ip_target',
     'primary',
 ] %}
-
+{% set debian_headers = "linux-headers-" + grains.get('kernelrelease')|string %}
 {% set network = salt['grains.filter_by']({
     'Arch': {
         'pkgs': ['wpa_supplicant', 'dhclient', 'wireless_tools', 'ifenslave'],
@@ -184,7 +184,7 @@
         'hostname_file': '/etc/hostname',
         'bridge_pkgs': ['bridge-utils'],
         'ovs_pkgs': ['openvswitch-switch', 'bridge-utils'],
-        'dpdk_pkgs': ['dpdk', 'dpdk-dev', 'dpdk-igb-uio-dkms', 'dpdk-rte-kni-dkms'],
+        'dpdk_pkgs': ['dpdk', 'dpdk-dev', 'dpdk-igb-uio-dkms', 'dpdk-rte-kni-dkms', debian_headers.encode('utf8') ],
         'network_manager': False,
         'systemd': {},
         'interface': {},
diff --git a/linux/system/auth.sls b/linux/system/auth.sls
index 70bf6cb..817d60e 100644
--- a/linux/system/auth.sls
+++ b/linux/system/auth.sls
@@ -7,6 +7,10 @@
 
 {%- if grains.os_family == 'Debian' %}
 
+linux_auth_ldap_debconf_package:
+  pkg.installed:
+  - pkgs: [ 'debconf-utils' ]
+
 linux_auth_debconf_libnss-ldapd:
   debconf.set:
     - name: libnss-ldapd
@@ -19,6 +23,8 @@
           value: 'false'
     - require_in:
       - pkg: linux_auth_ldap_packages
+    - require:
+      - pkg: linux_auth_ldap_debconf_package
 
 linux_auth_debconf_libpam-ldapd:
   debconf.set:
diff --git a/linux/system/user.sls b/linux/system/user.sls
index 5e37b5d..4d76454 100644
--- a/linux/system/user.sls
+++ b/linux/system/user.sls
@@ -29,7 +29,7 @@
   - password: {{ user.password }}
   - hash_password: {{ user.get('hash_password', False) }}
   {% endif %}
-  - gid_from_name: true
+  - gid_from_name: false
   {%- if user.groups is defined %}
   - groups: {{ user.groups }}
   {%- endif %}
diff --git a/metadata.yml b/metadata.yml
index 4bbfca2..d87f5a6 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
 name: "linux"
 version: "2017.4.1"
-source: "https://github.com/tcpcloud/salt-formula-linux"
+source: "https://github.com/salt-formulas/salt-formula-linux"