diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01
index 08902be0..09af179f 100644
--- a/make/Makefile.9000NPBP01R01
+++ b/make/Makefile.9000NPBP01R01
@@ -47,7 +47,10 @@ sysroot-verfile: sysroot-base
 sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
+	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
+	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 	$(TOOLSDIR)/ansible-stage-one $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
+	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
 	rm -rf $(TARGET_SYSROOT_DIR)/tmp/*
diff --git a/tsg-9140-scripts/roles/sapp/tasks/main.yml b/tsg-9140-scripts/roles/sapp/tasks/main.yml
index 713dedc5..5ba91a03 100644
--- a/tsg-9140-scripts/roles/sapp/tasks/main.yml
+++ b/tsg-9140-scripts/roles/sapp/tasks/main.yml
@@ -52,6 +52,12 @@
     dest: /etc/tmpfiles.d/sapp_tmpfile.conf
   tags: template
 
+- name: Template the gdev.conf
+  template:
+    src: "{{ role_path }}/templates/gdev.conf.j2"
+    dest: /home/mesasoft/sapp_run/etc/gdev.conf
+  tags: template
+
 - name: "sapp: service adapts runtimes"
   template:
     src: "{{ role_path }}/templates/adapt_runtimes.j2"