diff --git a/app/scripts/controllers/pod.js b/app/scripts/controllers/pod.js
index 45160b1f06..1ca396d945 100644
--- a/app/scripts/controllers/pod.js
+++ b/app/scripts/controllers/pod.js
@@ -415,27 +415,6 @@ angular.module('openshiftConsole')
           return running;
         };
 
-        $scope.showDebugAction = function(containerStatus) {
-          if (_.get($scope, 'pod.status.phase') === 'Completed') {
-            return false;
-          }
-
-          if (annotation($scope.pod, 'openshift.io/build.name')) {
-            return false;
-          }
-
-          if ($filter('isDebugPod')($scope.pod)) {
-            return false;
-          }
-
-          var waitingReason = _.get(containerStatus, 'state.waiting.reason');
-          if (waitingReason === 'ImagePullBackOff' || waitingReason === 'ErrImagePull') {
-            return false;
-          }
-
-          return !_.get(containerStatus, 'state.running') || !containerStatus.ready;
-        };
-
         $scope.$on('$destroy', function(){
           DataService.unwatchAll(watches);
           cleanUpDebugPod();
diff --git a/app/scripts/directives/resources.js b/app/scripts/directives/resources.js
index 1a7584ea5a..9a6a62a57d 100644
--- a/app/scripts/directives/resources.js
+++ b/app/scripts/directives/resources.js
@@ -1,6 +1,65 @@
 'use strict';
 
 angular.module('openshiftConsole')
+  .directive('containerStatuses', function($filter) {
+    return {
+      restrict: 'E',
+      scope: {
+        pod: '=',
+        onDebugTerminal: '=?',
+        detailed: '=?'
+      },
+      templateUrl: 'views/_container-statuses.html',
+      link: function(scope) {
+        scope.hasDebugTerminal = angular.isFunction(scope.onDebugTerminal);
+
+        var isContainerTerminatedSuccessfully = $filter('isContainerTerminatedSuccessfully');
+        var haveAllContainersTerminatedSuccessfully = function(containerStatuses) {
+          return _.every(containerStatuses, isContainerTerminatedSuccessfully);
+        };
+
+        scope.$watch('pod', function(updatedPod) {
+          scope.initContainersTerminated = haveAllContainersTerminatedSuccessfully(updatedPod.status.initContainerStatuses);
+
+          if (scope.expandInitContainers !== false) {
+            scope.expandInitContainers = !scope.initContainersTerminated;
+          }
+        });
+
+        scope.toggleInitContainer = function() {
+          scope.expandInitContainers = !scope.expandInitContainers;
+        };
+
+        scope.showDebugAction = function (containerStatus) {
+
+          if (_.get(scope.pod, 'status.phase') === 'Completed') {
+            return false;
+          }
+
+          if ($filter('annotation')(scope.pod, 'openshift.io/build.name')) {
+            return false;
+          }
+
+          if ($filter('isDebugPod')(scope.pod)) {
+            return false;
+          }
+
+          var waitingReason = _.get(containerStatus, 'state.waiting.reason');
+          if (waitingReason === 'ImagePullBackOff' || waitingReason === 'ErrImagePull') {
+            return false;
+          }
+
+          return !_.get(containerStatus, 'state.running') || !containerStatus.ready;
+        };
+
+        scope.debugTerminal = function(containerStatusName) {
+          if (scope.hasDebugTerminal) {
+            return scope.onDebugTerminal.call(this, containerStatusName);
+          }
+        };
+      }
+    };
+  })
   .directive('podTemplate', function() {
     return {
       restrict: 'E',
@@ -15,6 +74,19 @@ angular.module('openshiftConsole')
       templateUrl: 'views/_pod-template.html'
     };
   })
+  .directive('podTemplateContainer', function() {
+    return {
+      restrict: 'E',
+      scope: {
+        container: '=podTemplateContainer',
+        imagesByDockerReference: '=',
+        builds: '=',
+        detailed: '=?',
+        labelPrefix: '@?'
+      },
+      templateUrl: 'views/_pod-template-container.html'
+    };
+  })
   .directive('annotations', function() {
     return {
       restrict: 'E',
diff --git a/app/scripts/filters/resources.js b/app/scripts/filters/resources.js
index 0dd720863d..097f9cc4ba 100644
--- a/app/scripts/filters/resources.js
+++ b/app/scripts/filters/resources.js
@@ -314,6 +314,11 @@ angular.module('openshiftConsole')
       return containerStatus.state.terminated && containerStatus.state.terminated.exitCode !== 0;
     };
   })
+  .filter('isContainerTerminatedSuccessfully', function() {
+    return function(containerStatus) {
+      return containerStatus.state.terminated && containerStatus.state.terminated.exitCode === 0;
+    };
+  })
   .filter('isContainerUnprepared', function() {
     return function(containerStatus) {
       if (!containerStatus.state.running ||
diff --git a/app/views/_container-statuses.html b/app/views/_container-statuses.html
new file mode 100644
index 0000000000..cde6bb1e61
--- /dev/null
+++ b/app/views/_container-statuses.html
@@ -0,0 +1,69 @@
+<!--
+  Expects the following variables:
+  containerStatuses
+  onDebugTerminal (optional)
+  detailed (optional)
+ -->
+
+<div ng-if="detailed && pod.status.initContainerStatuses.length">
+  <h4 class="mar-bottom-xl" row ng-if="initContainersTerminated">
+    <span><i class="fa fa-check text-success"></i></span>
+    <span flex>
+      <ng-pluralize count="pod.status.initContainerStatuses.length"
+                      when="{'1': '&nbsp;Init container {{pod.status.initContainerStatuses[0].name}}','other': '&nbsp;{} init containers'}">
+      </ng-pluralize>
+      completed successfully
+    </span>
+    <span ng-if="initContainersTerminated">
+      <a class="page-header-link" href="" ng-click="toggleInitContainer()">
+        <span ng-if="!expandInitContainers">Show</span>
+        <span ng-if="expandInitContainers">Hide</span>
+        Details
+      </a>
+    </span>
+  </h4>
+
+  <div class="animate-if"
+       ng-if="expandInitContainers"
+       ng-repeat="containerStatus in pod.status.initContainerStatuses track by containerStatus.name" >
+    <h4 class="component-label">Init container {{containerStatus.name}}</h4>
+
+    <dl class="dl-horizontal left">
+      <dt>State:</dt>
+      <dd>
+        <kubernetes-object-describe-container-state container-state="containerStatus.state"></kubernetes-object-describe-container-state>
+      </dd>
+      <dt ng-if="!(containerStatus.lastState | isEmptyObj)">Last State</dt>
+      <dd ng-if="!(containerStatus.lastState | isEmptyObj)">
+        <kubernetes-object-describe-container-state container-state="containerStatus.lastState"></kubernetes-object-describe-container-state>
+      </dd>
+      <dt>Ready:</dt>
+      <dd>{{containerStatus.ready}}</dd>
+      <dt>Restart Count:</dt>
+      <dd>{{containerStatus.restartCount}}</dd>
+    </dl>
+  </div>
+</div>
+
+<div ng-repeat="containerStatus in pod.status.containerStatuses track by containerStatus.name" >
+  <h4>Container {{containerStatus.name}}</h4>
+
+  <dl class="dl-horizontal left">
+    <dt>State:</dt>
+    <dd>
+      <kubernetes-object-describe-container-state container-state="containerStatus.state"></kubernetes-object-describe-container-state>
+    </dd>
+    <dt ng-if="!(containerStatus.lastState | isEmptyObj)">Last State</dt>
+    <dd ng-if="!(containerStatus.lastState | isEmptyObj)">
+      <kubernetes-object-describe-container-state container-state="containerStatus.lastState"></kubernetes-object-describe-container-state>
+    </dd>
+    <dt>Ready:</dt>
+    <dd>{{containerStatus.ready}}</dd>
+    <dt>Restart Count:</dt>
+    <dd>{{containerStatus.restartCount}}</dd>
+
+    <div ng-if="hasDebugTerminal && showDebugAction(containerStatus) && ('pods' | canI : 'create')" class="debug-pod-action">
+      <a href="" ng-click="debugTerminal(containerStatus.name)" role="button">Debug in Terminal</a>
+    </div>
+  </dl>
+</div>
diff --git a/app/views/_pod-template-container.html b/app/views/_pod-template-container.html
new file mode 100644
index 0000000000..46e581d176
--- /dev/null
+++ b/app/views/_pod-template-container.html
@@ -0,0 +1,184 @@
+<!--
+  Expects the following variables:
+  podTemplateContainer
+  imagesByDockerReference (optional)
+  builds (optional)
+  detailed (optional)
+  labelPrefix (optional)
+ -->
+
+<div class="pod-template">
+  <div class="component-label"><span ng-bind-template="{{labelPrefix||'Container'}}:"></span> {{container.name}}</div>
+
+  <div row ng-if="container.image" class="pod-template-image icon-row">
+    <div class="icon-wrap">
+      <span class="pficon pficon-image" aria-hidden="true"></span>
+    </div>
+    <div flex class="word-break">
+      <span class="pod-template-key">Image:</span>
+      <span ng-if="!imagesByDockerReference[container.image]">{{container.image | imageStreamName}}</span>
+      <span ng-if="imagesByDockerReference[container.image]">
+            <a ng-href="{{imagesByDockerReference[container.image].imageStreamName | navigateResourceURL : 'ImageStream' : imagesByDockerReference[container.image].imageStreamNamespace}}">{{container.image | imageStreamName}}</a>
+            <span class="hash" title="{{imagesByDockerReference[container.image].metadata.name}}">{{imagesByDockerReference[container.image].metadata.name | stripSHAPrefix | limitTo: 7}}</span>
+            <span ng-if="imagesByDockerReference[container.image].dockerImageMetadata.Size" class="small text-muted nowrap">
+              {{imagesByDockerReference[container.image].dockerImageMetadata.Size | humanizeSize}}
+            </span>
+          </span>
+    </div>
+  </div>
+
+  <div ng-if="imagesByDockerReference && container.image && (image = imagesByDockerReference[container.image])" class="pod-template-build">
+    <div row class="icon-row" ng-if="build = (image | buildForImage : builds)">
+      <div class="icon-wrap">
+        <span class="fa fa-refresh" aria-hidden="true"></span>
+      </div>
+      <div flex class="word-break">
+        <span class="pod-template-key">Build:</span>
+        <span ng-if="build | configURLForResource">
+              <a ng-href="{{build | configURLForResource}}">{{build | buildConfigForBuild}}</a>,
+            </span>
+        <a ng-href="{{build | navigateResourceURL}}">
+          <span ng-if="(build | annotation : 'buildNumber')">#{{build | annotation : 'buildNumber'}}</span>
+          <span ng-if="!(build | annotation : 'buildNumber')">{{build.metadata.name}}</span>
+        </a>
+      </div>
+    </div>
+    <div row class="icon-row" ng-if="build.spec.source">
+      <div class="icon-wrap">
+        <span class="fa fa-code" aria-hidden="true"></span>
+      </div>
+      <div flex class="word-break">
+        <span class="pod-template-key">Source:</span>
+        <span ng-switch="build.spec.source.type">
+              <span ng-switch-when="Git">
+                <span ng-if="build.spec.revision.git.commit">
+                  {{build.spec.revision.git.message}}
+                  <osc-git-link
+                    class="hash"
+                    uri="build.spec.source.git.uri"
+                    ref="build.spec.revision.git.commit">{{build.spec.revision.git.commit | limitTo:7}}</osc-git-link>
+                  <span ng-if="detailed && build.spec.revision.git.author">
+                    authored by {{build.spec.revision.git.author.name}}
+                  </span>
+                </span>
+                <span ng-if="!build.spec.revision.git.commit">
+                  <osc-git-link uri="build.spec.source.git.uri">{{build.spec.source.git.uri}}</osc-git-link>
+                </span>
+              </span>
+              <span ng-switch-default>
+                {{build.spec.source.type || 'Unknown'}}
+              </span>
+            </span>
+      </div>
+    </div>
+  </div>
+
+  <div row ng-if="detailed && (container.command.length || container.args.length)" class="icon-row">
+    <div class="icon-wrap">
+      <span aria-hidden="true" class="fa fa-terminal"></span>
+    </div>
+    <div flex class="word-break">
+          <span class="pod-template-key">
+            Command:
+          </span>
+      <span>
+            <code class="command">
+              <truncate-long-text
+                content="container | entrypoint : imagesByDockerReference[container.image]"
+                limit="80"
+                newline-limit="1"
+                expandable="true"
+                use-word-boundary="false">
+              </truncate-long-text>
+            </code>
+          </span>
+    </div>
+  </div>
+
+  <div row ng-if="container.ports.length > 0" class="pod-template-ports icon-row">
+    <div class="icon-wrap">
+      <span data-icon="" aria-hidden="true" style="font-size:16px;line-height:normal"></span>
+    </div>
+    <div flex class="word-break">
+      <span class="pod-template-key">Ports:</span>
+      <span ng-repeat="port in container.ports | orderBy: 'containerPort' | limitToOrAll : detailed ? undefined : 1">
+        <span class="nowrap">{{port.containerPort}}/{{port.protocol}}</span><span ng-if="port.name"><span class="nowrap"> ({{port.name}})</span></span><span ng-if="port.hostPort"><span class="nowrap"><span class="port-icon"> &#8594;</span> {{port.hostPort}}</span></span><span ng-if="!$last">, </span>
+      </span>
+      <span ng-if="!detailed && container.ports.length >= 2">
+        and {{container.ports.length - 1}}
+        <span ng-if="container.ports.length > 2">others</span>
+        <span ng-if="container.ports.length === 2">other</span>
+      </span>
+    </div>
+  </div>
+
+  <div row ng-if="detailed" ng-repeat="mount in container.volumeMounts" class="icon-row">
+    <div class="icon-wrap">
+      <span aria-hidden="true" class="fa fa-database"></span>
+    </div>
+    <div flex class="word-break">
+      <span class="pod-template-key">Mount:</span>
+      <span>
+            {{mount.name}}<span ng-if="mount.subPath">, subpath {{mount.subPath}}</span>&#8201;&#8594;&#8201;<span>{{mount.mountPath}}</span>
+            <small class="text-muted">{{mount | volumeMountMode : podTemplate.spec.volumes}}</small>
+          </span>
+    </div>
+  </div>
+
+  <div row ng-if="detailed && (container.resources.requests.cpu || container.resources.limits.cpu)" class="icon-row">
+    <div class="icon-wrap">
+      <i class="fa fa-area-chart" aria-hidden="true"></i>
+    </div>
+    <div flex>
+      <span class="pod-template-key">CPU:</span>
+      <span ng-if="container.resources.requests.cpu && container.resources.limits.cpu">
+            {{container.resources.requests.cpu | usageWithUnits: 'cpu'}} to {{container.resources.limits.cpu | usageWithUnits: 'cpu'}}
+          </span>
+      <span ng-if="!container.resources.requests.cpu">
+            {{container.resources.limits.cpu | usageWithUnits: 'cpu'}} limit
+          </span>
+      <span ng-if="!container.resources.limits.cpu">
+            {{container.resources.requests.cpu | usageWithUnits: 'cpu'}} requested
+          </span>
+    </div>
+  </div>
+
+  <div row ng-if="detailed && (container.resources.requests.memory || container.resources.limits.memory)" class="icon-row">
+    <div class="icon-wrap">
+      <i class="fa fa-area-chart" aria-hidden="true"></i>
+    </div>
+    <div flex>
+      <span class="pod-template-key">Memory:</span>
+      <span ng-if="container.resources.requests.memory && container.resources.limits.memory">
+            {{container.resources.requests.memory | usageWithUnits: 'memory'}} to {{container.resources.limits.memory | usageWithUnits: 'memory'}}
+          </span>
+      <span ng-if="!container.resources.requests.memory">
+            {{container.resources.limits.memory | usageWithUnits: 'memory'}} limit
+          </span>
+      <span ng-if="!container.resources.limits.memory">
+            {{container.resources.requests.memory | usageWithUnits: 'memory'}} requested
+          </span>
+    </div>
+  </div>
+
+  <div row ng-if="detailed && container.readinessProbe" class="icon-row">
+    <div class="icon-wrap">
+      <i class="fa fa-medkit" aria-hidden="true"></i>
+    </div>
+    <div flex>
+      <span class="pod-template-key">Readiness Probe:</span>
+      <probe probe="container.readinessProbe"></probe>
+    </div>
+  </div>
+
+  <div row ng-if="detailed && container.livenessProbe" class="icon-row">
+    <div class="icon-wrap">
+      <i class="fa fa-medkit" aria-hidden="true"></i>
+    </div>
+    <div flex>
+      <span class="pod-template-key">Liveness Probe:</span>
+      <probe probe="container.livenessProbe"></probe>
+    </div>
+  </div>
+
+</div>
diff --git a/app/views/_pod-template.html b/app/views/_pod-template.html
index ac23b7eddd..9b92c913a7 100644
--- a/app/views/_pod-template.html
+++ b/app/views/_pod-template.html
@@ -7,188 +7,43 @@
   addHealthCheckUrl (optional)
  -->
 
- <!-- Prompt to add health checks if missing. -->
+<!-- Prompt to add health checks if missing. -->
 <div ng-if="detailed && addHealthCheckUrl && !(podTemplate | hasHealthChecks)" class="alert alert-info">
   <span class="pficon pficon-info" aria-hidden="true"></span>
-  <span ng-if="podTemplate.spec.containers.length === 1">This container has no health checks</span>
+  <span ng-if="podTemplate.spec.containers.length === 1">Container {{podTemplate.spec.containers[0].name}} does not have health checks</span>
   <span ng-if="podTemplate.spec.containers.length > 1">Not all containers have health checks</span>
   to ensure your application is running correctly.
   <a ng-href="{{addHealthCheckUrl}}" class="nowrap">Add Health Checks</a>
 </div>
 
-<div class="pod-template-container">
-  <div class="pod-template-block" ng-repeat="container in podTemplate.spec.containers">
-    <div class="pod-template">
-      <div class="component-label">Container: {{container.name}}</div>
-      <div row ng-if="container.image" class="pod-template-image icon-row">
-        <div class="icon-wrap">
-          <span class="pficon pficon-image" aria-hidden="true"></span>
-        </div>
-        <div flex class="word-break">
-          <span class="pod-template-key">Image:</span>
-          <span ng-if="!imagesByDockerReference[container.image]">{{container.image | imageStreamName}}</span>
-          <span ng-if="imagesByDockerReference[container.image]">
-            <a ng-href="{{imagesByDockerReference[container.image].imageStreamName | navigateResourceURL : 'ImageStream' : imagesByDockerReference[container.image].imageStreamNamespace}}">{{container.image | imageStreamName}}</a>
-            <span class="hash" title="{{imagesByDockerReference[container.image].metadata.name}}">{{imagesByDockerReference[container.image].metadata.name | stripSHAPrefix | limitTo: 7}}</span>
-            <span ng-if="imagesByDockerReference[container.image].dockerImageMetadata.Size" class="small text-muted nowrap">
-              {{imagesByDockerReference[container.image].dockerImageMetadata.Size | humanizeSize}}
-            </span>
-          </span>
-        </div>
-      </div>
-      <div ng-if="imagesByDockerReference && container.image && (image = imagesByDockerReference[container.image])" class="pod-template-build">
-        <div row class="icon-row" ng-if="build = (image | buildForImage : builds)">
-          <div class="icon-wrap">
-            <span class="fa fa-refresh" aria-hidden="true"></span>
-          </div>
-          <div flex class="word-break">
-            <span class="pod-template-key">Build:</span>
-            <span ng-if="build | configURLForResource">
-              <a ng-href="{{build | configURLForResource}}">{{build | buildConfigForBuild}}</a>,
-            </span>
-            <a ng-href="{{build | navigateResourceURL}}">
-              <span ng-if="(build | annotation : 'buildNumber')">#{{build | annotation : 'buildNumber'}}</span>
-              <span ng-if="!(build | annotation : 'buildNumber')">{{build.metadata.name}}</span>
-            </a>
-          </div>
-        </div>
-        <div row class="icon-row" ng-if="build.spec.source">
-          <div class="icon-wrap">
-            <span class="fa fa-code" aria-hidden="true"></span>
-          </div>
-          <div flex class="word-break">
-            <span class="pod-template-key">Source:</span>
-            <span ng-switch="build.spec.source.type">
-              <span ng-switch-when="Git">
-                <span ng-if="build.spec.revision.git.commit">
-                  {{build.spec.revision.git.message}}
-                  <osc-git-link
-                    class="hash"
-                    uri="build.spec.source.git.uri"
-                    ref="build.spec.revision.git.commit">{{build.spec.revision.git.commit | limitTo:7}}</osc-git-link>
-                  <span ng-if="detailed && build.spec.revision.git.author">
-                    authored by {{build.spec.revision.git.author.name}}
-                  </span>
-                </span>
-                <span ng-if="!build.spec.revision.git.commit">
-                  <osc-git-link uri="build.spec.source.git.uri">{{build.spec.source.git.uri}}</osc-git-link>
-                </span>
-              </span>
-              <span ng-switch-default>
-                {{build.spec.source.type || 'Unknown'}}
-              </span>
-            </span>
-          </div>
-        </div>
-      </div>
+<div ng-if="detailed && podTemplate.spec.initContainers.length">
+  <h4>Init Containers</h4>
 
-      <div row ng-if="detailed && (container.command.length || container.args.length)" class="icon-row">
-        <div class="icon-wrap">
-          <span aria-hidden="true" class="fa fa-terminal"></span>
-        </div>
-        <div flex class="word-break">
-          <span class="pod-template-key">
-            Command:
-          </span>
-          <span>
-            <code class="command">
-              <truncate-long-text
-                  content="container | entrypoint : imagesByDockerReference[container.image]"
-                  limit="80"
-                  newline-limit="1"
-                  expandable="true"
-                  use-word-boundary="false">
-              </truncate-long-text>
-            </code>
-          </span>
-        </div>
-      </div>
+  <div class="pod-template-container">
+    <div class="pod-template-block" ng-repeat="container in podTemplate.spec.initContainers">
 
-      <div row ng-if="container.ports.length > 0" class="pod-template-ports icon-row">
-        <div class="icon-wrap">
-          <span data-icon="" aria-hidden="true" style="font-size:16px;line-height:normal"></span>
-        </div>
-        <div flex class="word-break">
-          <span class="pod-template-key">Ports:</span>
-          <span ng-repeat="port in container.ports | orderBy: 'containerPort' | limitToOrAll : detailed ? undefined : 1">
-            <span class="nowrap">{{port.containerPort}}/{{port.protocol}}</span><span ng-if="port.name"><span class="nowrap"> ({{port.name}})</span></span><span ng-if="port.hostPort"><span class="nowrap"><span class="port-icon"> &#8594;</span> {{port.hostPort}}</span></span><span ng-if="!$last">, </span>
-          </span>
-          <span ng-if="!detailed && container.ports.length >= 2">
-            and {{container.ports.length - 1}}
-            <span ng-if="container.ports.length > 2">others</span>
-            <span ng-if="container.ports.length === 2">other</span>
-          </span>
-        </div>
-      </div>
+      <pod-template-container
+        pod-template-container="container"
+        images-by-docker-reference="imagesByDockerReference"
+        builds="builds"
+        detailed="detailed"
+        label-prefix="Init Container"></pod-template-container>
 
-      <div row ng-if="detailed" ng-repeat="mount in container.volumeMounts" class="icon-row">
-        <div class="icon-wrap">
-          <span aria-hidden="true" class="fa fa-database"></span>
-        </div>
-        <div flex class="word-break">
-          <span class="pod-template-key">Mount:</span>
-          <span>
-            {{mount.name}}<span ng-if="mount.subPath">, subpath {{mount.subPath}}</span>&#8201;&#8594;&#8201;<span>{{mount.mountPath}}</span>
-            <small class="text-muted">{{mount | volumeMountMode : podTemplate.spec.volumes}}</small>
-          </span>
-        </div>
-      </div>
-
-      <div row ng-if="detailed && (container.resources.requests.cpu || container.resources.limits.cpu)" class="icon-row">
-        <div class="icon-wrap">
-          <i class="fa fa-area-chart" aria-hidden="true"></i>
-        </div>
-        <div flex>
-          <span class="pod-template-key">CPU:</span>
-          <span ng-if="container.resources.requests.cpu && container.resources.limits.cpu">
-            {{container.resources.requests.cpu | usageWithUnits: 'cpu'}} to {{container.resources.limits.cpu | usageWithUnits: 'cpu'}}
-          </span>
-          <span ng-if="!container.resources.requests.cpu">
-            {{container.resources.limits.cpu | usageWithUnits: 'cpu'}} limit
-          </span>
-          <span ng-if="!container.resources.limits.cpu">
-            {{container.resources.requests.cpu | usageWithUnits: 'cpu'}} requested
-          </span>
-        </div>
-      </div>
+    </div>
+  </div>
+</div>
 
-      <div row ng-if="detailed && (container.resources.requests.memory || container.resources.limits.memory)" class="icon-row">
-        <div class="icon-wrap">
-          <i class="fa fa-area-chart" aria-hidden="true"></i>
-        </div>
-        <div flex>
-          <span class="pod-template-key">Memory:</span>
-          <span ng-if="container.resources.requests.memory && container.resources.limits.memory">
-            {{container.resources.requests.memory | usageWithUnits: 'memory'}} to {{container.resources.limits.memory | usageWithUnits: 'memory'}}
-          </span>
-          <span ng-if="!container.resources.requests.memory">
-            {{container.resources.limits.memory | usageWithUnits: 'memory'}} limit
-          </span>
-          <span ng-if="!container.resources.limits.memory">
-            {{container.resources.requests.memory | usageWithUnits: 'memory'}} requested
-          </span>
-        </div>
-      </div>
+<div>
+  <h4 ng-if="detailed">Containers</h4>
 
-      <div row ng-if="detailed && container.readinessProbe" class="icon-row">
-        <div class="icon-wrap">
-          <i class="fa fa-medkit" aria-hidden="true"></i>
-        </div>
-        <div flex>
-          <span class="pod-template-key">Readiness Probe:</span>
-          <probe probe="container.readinessProbe"></probe>
-        </div>
-      </div>
+  <div class="pod-template-container">
+    <div class="pod-template-block" ng-repeat="container in podTemplate.spec.containers">
 
-      <div row ng-if="detailed && container.livenessProbe" class="icon-row">
-        <div class="icon-wrap">
-          <i class="fa fa-medkit" aria-hidden="true"></i>
-        </div>
-        <div flex>
-          <span class="pod-template-key">Liveness Probe:</span>
-          <probe probe="container.livenessProbe"></probe>
-        </div>
-      </div>
+      <pod-template-container
+        pod-template-container="container"
+        images-by-docker-reference="imagesByDockerReference"
+        builds="builds"
+        detailed="detailed"></pod-template-container>
 
       <div
         extension-point
diff --git a/app/views/browse/_pod-details.html b/app/views/browse/_pod-details.html
index b7ad7a0e01..7721ec61ce 100644
--- a/app/views/browse/_pod-details.html
+++ b/app/views/browse/_pod-details.html
@@ -55,28 +55,15 @@ <h3>
           </span>
         </dd>
       </dl>
-      <div ng-repeat="containerStatus in pod.status.containerStatuses | orderBy:'name'" >
-        <h4>Container {{containerStatus.name}}</h4>
-        <dl class="dl-horizontal left">
-          <dt>State:</dt>
-          <dd>
-            <kubernetes-object-describe-container-state container-state="containerStatus.state"></kubernetes-object-describe-container-state>
-          </dd>
-          <dt ng-if="!(containerStatus.lastState | isEmptyObj)">Last State</dt>
-          <dd ng-if="!(containerStatus.lastState | isEmptyObj)">
-            <kubernetes-object-describe-container-state container-state="containerStatus.lastState"></kubernetes-object-describe-container-state>
-          </dd>
-          <dt>Ready:</dt>
-          <dd>{{containerStatus.ready}}</dd>
-          <dt>Restart Count:</dt>
-          <dd>{{containerStatus.restartCount}}</dd>
-          <div ng-if="showDebugAction(containerStatus) && ('pods' | canI : 'create')" class="debug-pod-action">
-            <a href="" ng-click="debugTerminal(containerStatus.name)" role="button">Debug in Terminal</a>
-          </div>
-        </dl>
+      <div>
+        <container-statuses
+          pod="pod"
+          on-debug-terminal="debugTerminal"
+          detailed="true"></container-statuses>
       </div>
     </div>
     <div class="col-lg-6">
+
       <h3>Template</h3>
       <pod-template
         pod-template="pod"
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 8a58ad83a2..5b0e77a1cf 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -4520,12 +4520,6 @@ var b = 0;
 return a && a.forEach(function(a) {
 a.state && a.state.running && b++;
 }), b;
-}, a.showDebugAction = function(c) {
-if ("Completed" === _.get(a, "pod.status.phase")) return !1;
-if (z(a.pod, "openshift.io/build.name")) return !1;
-if (b("isDebugPod")(a.pod)) return !1;
-var d = _.get(c, "state.waiting.reason");
-return "ImagePullBackOff" !== d && "ErrImagePull" !== d && (!_.get(c, "state.running") || !c.ready);
 }, a.$on("$destroy", function() {
 g.unwatchAll(n), m(), $(window).off("resize.terminalsize");
 });
@@ -9906,7 +9900,36 @@ a.model.editing = !1;
 };
 }
 };
-}), angular.module("openshiftConsole").directive("podTemplate", function() {
+}), angular.module("openshiftConsole").directive("containerStatuses", [ "$filter", function(a) {
+return {
+restrict:"E",
+scope:{
+pod:"=",
+onDebugTerminal:"=?",
+detailed:"=?"
+},
+templateUrl:"views/_container-statuses.html",
+link:function(b) {
+b.hasDebugTerminal = angular.isFunction(b.onDebugTerminal);
+var c = a("isContainerTerminatedSuccessfully"), d = function(a) {
+return _.every(a, c);
+};
+b.$watch("pod", function(a) {
+b.initContainersTerminated = d(a.status.initContainerStatuses), b.expandInitContainers !== !1 && (b.expandInitContainers = !b.initContainersTerminated);
+}), b.toggleInitContainer = function() {
+b.expandInitContainers = !b.expandInitContainers;
+}, b.showDebugAction = function(c) {
+if ("Completed" === _.get(b.pod, "status.phase")) return !1;
+if (a("annotation")(b.pod, "openshift.io/build.name")) return !1;
+if (a("isDebugPod")(b.pod)) return !1;
+var d = _.get(c, "state.waiting.reason");
+return "ImagePullBackOff" !== d && "ErrImagePull" !== d && (!_.get(c, "state.running") || !c.ready);
+}, b.debugTerminal = function(a) {
+if (b.hasDebugTerminal) return b.onDebugTerminal.call(this, a);
+};
+}
+};
+} ]).directive("podTemplate", function() {
 return {
 restrict:"E",
 scope:{
@@ -9918,6 +9941,18 @@ addHealthCheckUrl:"@?"
 },
 templateUrl:"views/_pod-template.html"
 };
+}).directive("podTemplateContainer", function() {
+return {
+restrict:"E",
+scope:{
+container:"=podTemplateContainer",
+imagesByDockerReference:"=",
+builds:"=",
+detailed:"=?",
+labelPrefix:"@?"
+},
+templateUrl:"views/_pod-template-container.html"
+};
 }).directive("annotations", function() {
 return {
 restrict:"E",
@@ -13526,6 +13561,10 @@ return a.state.waiting && "CrashLoopBackOff" === a.state.waiting.reason;
 return function(a) {
 return a.state.terminated && 0 !== a.state.terminated.exitCode;
 };
+}).filter("isContainerTerminatedSuccessfully", function() {
+return function(a) {
+return a.state.terminated && 0 === a.state.terminated.exitCode;
+};
 }).filter("isContainerUnprepared", function() {
 return function(a) {
 if (!a.state.running || a.ready !== !1 || !a.state.running.startedAt) return !1;
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 4d6bef6baa..394df77bd4 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -138,6 +138,64 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   );
 
 
+  $templateCache.put('views/_container-statuses.html',
+    " <div ng-if=\"detailed && pod.status.initContainerStatuses.length\">\n" +
+    "<h4 class=\"mar-bottom-xl\" row ng-if=\"initContainersTerminated\">\n" +
+    "<span><i class=\"fa fa-check text-success\"></i></span>\n" +
+    "<span flex>\n" +
+    "<ng-pluralize count=\"pod.status.initContainerStatuses.length\" when=\"{'1': '&nbsp;Init container {{pod.status.initContainerStatuses[0].name}}','other': '&nbsp;{} init containers'}\">\n" +
+    "</ng-pluralize>\n" +
+    "completed successfully\n" +
+    "</span>\n" +
+    "<span ng-if=\"initContainersTerminated\">\n" +
+    "<a class=\"page-header-link\" href=\"\" ng-click=\"toggleInitContainer()\">\n" +
+    "<span ng-if=\"!expandInitContainers\">Show</span>\n" +
+    "<span ng-if=\"expandInitContainers\">Hide</span>\n" +
+    "Details\n" +
+    "</a>\n" +
+    "</span>\n" +
+    "</h4>\n" +
+    "<div class=\"animate-if\" ng-if=\"expandInitContainers\" ng-repeat=\"containerStatus in pod.status.initContainerStatuses track by containerStatus.name\">\n" +
+    "<h4 class=\"component-label\">Init container {{containerStatus.name}}</h4>\n" +
+    "<dl class=\"dl-horizontal left\">\n" +
+    "<dt>State:</dt>\n" +
+    "<dd>\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
+    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt>Ready:</dt>\n" +
+    "<dd>{{containerStatus.ready}}</dd>\n" +
+    "<dt>Restart Count:</dt>\n" +
+    "<dd>{{containerStatus.restartCount}}</dd>\n" +
+    "</dl>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div ng-repeat=\"containerStatus in pod.status.containerStatuses track by containerStatus.name\">\n" +
+    "<h4>Container {{containerStatus.name}}</h4>\n" +
+    "<dl class=\"dl-horizontal left\">\n" +
+    "<dt>State:</dt>\n" +
+    "<dd>\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
+    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt>Ready:</dt>\n" +
+    "<dd>{{containerStatus.ready}}</dd>\n" +
+    "<dt>Restart Count:</dt>\n" +
+    "<dd>{{containerStatus.restartCount}}</dd>\n" +
+    "<div ng-if=\"hasDebugTerminal && showDebugAction(containerStatus) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
+    "<a href=\"\" ng-click=\"debugTerminal(containerStatus.name)\" role=\"button\">Debug in Terminal</a>\n" +
+    "</div>\n" +
+    "</dl>\n" +
+    "</div>"
+  );
+
+
   $templateCache.put('views/_edit-request-limit.html',
     "<ng-form name=\"form\" ng-if=\"!requestCalculated || !limitCalculated\">\n" +
     "<h3>\n" +
@@ -187,18 +245,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   );
 
 
-  $templateCache.put('views/_pod-template.html',
-    " <div ng-if=\"detailed && addHealthCheckUrl && !(podTemplate | hasHealthChecks)\" class=\"alert alert-info\">\n" +
-    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
-    "<span ng-if=\"podTemplate.spec.containers.length === 1\">This container has no health checks</span>\n" +
-    "<span ng-if=\"podTemplate.spec.containers.length > 1\">Not all containers have health checks</span>\n" +
-    "to ensure your application is running correctly.\n" +
-    "<a ng-href=\"{{addHealthCheckUrl}}\" class=\"nowrap\">Add Health Checks</a>\n" +
-    "</div>\n" +
-    "<div class=\"pod-template-container\">\n" +
-    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.containers\">\n" +
-    "<div class=\"pod-template\">\n" +
-    "<div class=\"component-label\">Container: {{container.name}}</div>\n" +
+  $templateCache.put('views/_pod-template-container.html',
+    " <div class=\"pod-template\">\n" +
+    "<div class=\"component-label\"><span ng-bind-template=\"{{labelPrefix||'Container'}}:\"></span> {{container.name}}</div>\n" +
     "<div row ng-if=\"container.image\" class=\"pod-template-image icon-row\">\n" +
     "<div class=\"icon-wrap\">\n" +
     "<span class=\"pficon pficon-image\" aria-hidden=\"true\"></span>\n" +
@@ -353,6 +402,31 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<probe probe=\"container.livenessProbe\"></probe>\n" +
     "</div>\n" +
     "</div>\n" +
+    "</div>"
+  );
+
+
+  $templateCache.put('views/_pod-template.html',
+    " <div ng-if=\"detailed && addHealthCheckUrl && !(podTemplate | hasHealthChecks)\" class=\"alert alert-info\">\n" +
+    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-if=\"podTemplate.spec.containers.length === 1\">Container {{podTemplate.spec.containers[0].name}} does not have health checks</span>\n" +
+    "<span ng-if=\"podTemplate.spec.containers.length > 1\">Not all containers have health checks</span>\n" +
+    "to ensure your application is running correctly.\n" +
+    "<a ng-href=\"{{addHealthCheckUrl}}\" class=\"nowrap\">Add Health Checks</a>\n" +
+    "</div>\n" +
+    "<div ng-if=\"detailed && podTemplate.spec.initContainers.length\">\n" +
+    "<h4>Init Containers</h4>\n" +
+    "<div class=\"pod-template-container\">\n" +
+    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.initContainers\">\n" +
+    "<pod-template-container pod-template-container=\"container\" images-by-docker-reference=\"imagesByDockerReference\" builds=\"builds\" detailed=\"detailed\" label-prefix=\"Init Container\"></pod-template-container>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div>\n" +
+    "<h4 ng-if=\"detailed\">Containers</h4>\n" +
+    "<div class=\"pod-template-container\">\n" +
+    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.containers\">\n" +
+    "<pod-template-container pod-template-container=\"container\" images-by-docker-reference=\"imagesByDockerReference\" builds=\"builds\" detailed=\"detailed\"></pod-template-container>\n" +
     "<div extension-point extension-name=\"container-links\" extension-types=\"link dom\" extension-args=\"[container, podTemplate]\"></div>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -1262,25 +1336,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</dd>\n" +
     "</dl>\n" +
-    "<div ng-repeat=\"containerStatus in pod.status.containerStatuses | orderBy:'name'\">\n" +
-    "<h4>Container {{containerStatus.name}}</h4>\n" +
-    "<dl class=\"dl-horizontal left\">\n" +
-    "<dt>State:</dt>\n" +
-    "<dd>\n" +
-    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
-    "</dd>\n" +
-    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
-    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
-    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
-    "</dd>\n" +
-    "<dt>Ready:</dt>\n" +
-    "<dd>{{containerStatus.ready}}</dd>\n" +
-    "<dt>Restart Count:</dt>\n" +
-    "<dd>{{containerStatus.restartCount}}</dd>\n" +
-    "<div ng-if=\"showDebugAction(containerStatus) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
-    "<a href=\"\" ng-click=\"debugTerminal(containerStatus.name)\" role=\"button\">Debug in Terminal</a>\n" +
-    "</div>\n" +
-    "</dl>\n" +
+    "<div>\n" +
+    "<container-statuses pod=\"pod\" on-debug-terminal=\"debugTerminal\" detailed=\"true\"></container-statuses>\n" +
     "</div>\n" +
     "</div>\n" +
     "<div class=\"col-lg-6\">\n" +