diff --git a/nailgun/nailgun/task/task.py b/nailgun/nailgun/task/task.py
index b9c9197a2b..c5eefb2be2 100644
--- a/nailgun/nailgun/task/task.py
+++ b/nailgun/nailgun/task/task.py
@@ -1307,7 +1307,8 @@ class DumpTask(object):
         dump_conf = deepcopy(settings.DUMP)
         for node in nodes:
             host = {
-                'address': objects.Node.get_node_fqdn(node),
+                'hostname': objects.Node.get_slave_name(node),
+                'address': node.ip,
                 'ssh-key': settings.SHOTGUN_SSH_KEY,
             }
 
diff --git a/nailgun/nailgun/test/unit/test_logs_handlers.py b/nailgun/nailgun/test/unit/test_logs_handlers.py
index e26b45f9f1..5ebe726fc9 100644
--- a/nailgun/nailgun/test/unit/test_logs_handlers.py
+++ b/nailgun/nailgun/test/unit/test_logs_handlers.py
@@ -409,7 +409,8 @@ class TestLogs(BaseIntegrationTest):
     def test_snapshot_conf(self):
         self.env.create_node(
             status='ready',
-            hostname='node111'
+            hostname='node111',
+            ip='10.109.0.2',
         )
         conf = {
             'dump': {
@@ -426,7 +427,8 @@ class TestLogs(BaseIntegrationTest):
                 },
                 'slave': {
                     'hosts': [{
-                        'address': 'node111.example.com',
+                        'hostname': 'node111',
+                        'address': '10.109.0.2',
                         'ssh-key': '/root/.ssh/id_rsa',
                     }],
                     'objects': [],
diff --git a/nailgun/nailgun/test/unit/test_snapshot_conf.py b/nailgun/nailgun/test/unit/test_snapshot_conf.py
index deb1652bb0..d5a2f49635 100644
--- a/nailgun/nailgun/test/unit/test_snapshot_conf.py
+++ b/nailgun/nailgun/test/unit/test_snapshot_conf.py
@@ -69,19 +69,21 @@ class TestSnapshotConf(base.TestCase):
             mock_db.return_value.query.return_value.filter.return_value.
             all.return_value
         ) = [
-            mock.Mock(hostname='node1', roles=[]),
-            mock.Mock(hostname='node2', roles=[]),
+            mock.Mock(hostname='node1', ip="10.109.0.2", roles=[]),
+            mock.Mock(hostname='node2', ip="10.109.0.5", roles=[]),
         ]
 
         conf = task.DumpTask.conf()
 
         self.assertIn({
-            'address': 'node1.example.com',
+            'hostname': 'node1',
+            'address': '10.109.0.2',
             'ssh-key': settings.SHOTGUN_SSH_KEY,
         }, conf['dump']['slave']['hosts'])
 
         self.assertIn({
-            'address': 'node2.example.com',
+            'hostname': 'node2',
+            'address': '10.109.0.5',
             'ssh-key': settings.SHOTGUN_SSH_KEY,
         }, conf['dump']['slave']['hosts'])
 
@@ -92,18 +94,20 @@ class TestSnapshotConf(base.TestCase):
             mock_db.return_value.query.return_value.filter.return_value.
             all.return_value
         ) = [
-            mock.Mock(hostname='node1', roles=['controller', 'cinder']),
+            mock.Mock(hostname='node1', ip='10.109.0.1', roles=['controller',
+                      'cinder']),
             mock.Mock(hostname='node2', roles=['compute']),
         ]
 
         conf = task.DumpTask.conf()
 
         self.assertIn({
-            'address': 'node1.example.com',
+            'hostname': 'node1',
+            'address': '10.109.0.1',
             'ssh-key': settings.SHOTGUN_SSH_KEY,
         }, conf['dump']['controller']['hosts'])
 
         self.assertNotIn({
-            'address': 'node2.example.com',
+            'hostname': 'node2',
             'ssh-key': settings.SHOTGUN_SSH_KEY,
         }, conf['dump']['controller']['hosts'])