diff --git a/paunch/builder/base.py b/paunch/builder/base.py
index 875d723..f0a4671 100644
--- a/paunch/builder/base.py
+++ b/paunch/builder/base.py
@@ -248,7 +248,7 @@ class BaseBuilder(object):
 
         if container_image:
             image_id_str = self.runner.inspect(
-                container_image, "{{index .Id}}", o_type='image')
+                container_image, "{{.Id}}", o_type='image')
             if str(image_id_str).strip() != inspect_info.get('Image'):
                 self.log.debug("Deleting container (image updated): "
                                "%s" % container)
diff --git a/paunch/tests/test_builder_base.py b/paunch/tests/test_builder_base.py
index aaf0587..7eb09d5 100644
--- a/paunch/tests/test_builder_base.py
+++ b/paunch/tests/test_builder_base.py
@@ -652,7 +652,7 @@ three-12345678 three''', '', 0),
         calls = [
             mock.call('one'),
             mock.call('127.0.0.1:8787/centos:7',
-                      '{{index .Id}}',
+                      '{{.Id}}',
                       o_type='image')
         ]
         mock_inspect.has_calls(calls)
@@ -795,7 +795,7 @@ three-12345678 three''', '', 0),
         calls = [
             mock.call('one'),
             mock.call('127.0.0.1:8787/centos:7',
-                      '{{index .Id}}',
+                      '{{.Id}}',
                       o_type='image')
         ]
         mock_inspect.has_calls(calls)