diff --git a/deployment_scripts/puppet/manifests/odl-netconfig.pp b/deployment_scripts/puppet/manifests/odl-netconfig.pp
index 24b999f..a1d7791 100644
--- a/deployment_scripts/puppet/manifests/odl-netconfig.pp
+++ b/deployment_scripts/puppet/manifests/odl-netconfig.pp
@@ -108,7 +108,11 @@ $run_ping_checker = hiera('run_ping_checker', true)
 if $run_ping_checker {
     # check that network was configured successfully
     # and the default gateway is online
-    $default_gateway = hiera('default_gateway')
+    if hiera('default_gateway', false) {
+        $default_gateway = hiera('default_gateway')
+    } else {
+        $default_gateway = get_default_gateways()
+    }
 
     ping_host { $default_gateway :
         ensure => 'up',
diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp
index d723c69..1f95037 100644
--- a/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/hiera_override.pp
@@ -1,11 +1,5 @@
 class opendaylight::hiera_override {
-  $override_file = '/etc/hiera/override/opendaylight.yaml'
+  $override_file = '/etc/hiera/plugins/opendaylight.yaml'
   $roles = hiera('roles')
   odl_hiera_overrides($override_file, $roles)
-
-  file_line {'opendaylight_hiera_override':
-    path  => '/etc/hiera.yaml',
-    line  => '    - override/opendaylight',
-    after => '    - "override/module/%{calling_module}"',
-  }
 }