diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -747,7 +747,6 @@
     'DiffusionRepositoryByIDRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php',
     'DiffusionRepositoryClusterEngine' => 'applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php',
     'DiffusionRepositoryClusterEngineLogInterface' => 'applications/diffusion/protocol/DiffusionRepositoryClusterEngineLogInterface.php',
-    'DiffusionRepositoryClusterManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryClusterManagementPanel.php',
     'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php',
     'DiffusionRepositoryCreateController' => 'applications/diffusion/controller/DiffusionRepositoryCreateController.php',
     'DiffusionRepositoryDatasource' => 'applications/diffusion/typeahead/DiffusionRepositoryDatasource.php',
@@ -781,6 +780,7 @@
     'DiffusionRepositoryRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php',
     'DiffusionRepositorySearchConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRepositorySearchConduitAPIMethod.php',
     'DiffusionRepositoryStatusManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php',
+    'DiffusionRepositoryStorageManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php',
     'DiffusionRepositorySymbolsController' => 'applications/diffusion/controller/DiffusionRepositorySymbolsController.php',
     'DiffusionRepositoryTag' => 'applications/diffusion/data/DiffusionRepositoryTag.php',
     'DiffusionRepositoryTestAutomationController' => 'applications/diffusion/controller/DiffusionRepositoryTestAutomationController.php',
@@ -4959,7 +4959,6 @@
     'DiffusionRepositoryBasicsManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositoryByIDRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'DiffusionRepositoryClusterEngine' => 'Phobject',
-    'DiffusionRepositoryClusterManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositoryController' => 'DiffusionController',
     'DiffusionRepositoryCreateController' => 'DiffusionRepositoryEditController',
     'DiffusionRepositoryDatasource' => 'PhabricatorTypeaheadDatasource',
@@ -4993,6 +4992,7 @@
     'DiffusionRepositoryRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'DiffusionRepositorySearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'DiffusionRepositoryStatusManagementPanel' => 'DiffusionRepositoryManagementPanel',
+    'DiffusionRepositoryStorageManagementPanel' => 'DiffusionRepositoryManagementPanel',
     'DiffusionRepositorySymbolsController' => 'DiffusionRepositoryEditController',
     'DiffusionRepositoryTag' => 'Phobject',
     'DiffusionRepositoryTestAutomationController' => 'DiffusionRepositoryEditController',
diff --git a/src/applications/diffusion/management/DiffusionRepositoryClusterManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
rename from src/applications/diffusion/management/DiffusionRepositoryClusterManagementPanel.php
rename to src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
--- a/src/applications/diffusion/management/DiffusionRepositoryClusterManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php
@@ -1,12 +1,12 @@
 <?php
 
-final class DiffusionRepositoryClusterManagementPanel
+final class DiffusionRepositoryStorageManagementPanel
   extends DiffusionRepositoryManagementPanel {
 
-  const PANELKEY = 'cluster';
+  const PANELKEY = 'storage';
 
   public function getManagementPanelLabel() {
-    return pht('Cluster Configuration');
+    return pht('Storage');
   }
 
   public function getManagementPanelOrder() {
@@ -14,6 +14,45 @@
   }
 
   public function buildManagementPanelContent() {
+    return array(
+      $this->buildStorageStatusPanel(),
+      $this->buildClusterStatusPanel(),
+    );
+  }
+
+  private function buildStorageStatusPanel() {
+    $repository = $this->getRepository();
+    $viewer = $this->getViewer();
+
+    $view = id(new PHUIPropertyListView())
+      ->setViewer($viewer);
+
+    if ($repository->usesLocalWorkingCopy()) {
+      $storage_path = $repository->getHumanReadableDetail('local-path');
+    } else {
+      $storage_path = phutil_tag('em', array(), pht('No Local Working Copy'));
+    }
+
+    $service_phid = $repository->getAlmanacServicePHID();
+    if ($service_phid) {
+      $storage_service = $viewer->renderHandle($service_phid);
+    } else {
+      $storage_service = phutil_tag('em', array(), pht('Local'));
+    }
+
+    $view->addProperty(pht('Storage Path'), $storage_path);
+    $view->addProperty(pht('Storage Cluster'), $storage_service);
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Storage'));
+
+    return id(new PHUIObjectBoxView())
+      ->setHeader($header)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->addPropertyList($view);
+  }
+
+  private function buildClusterStatusPanel() {
     $repository = $this->getRepository();
     $viewer = $this->getViewer();
 
@@ -175,18 +214,6 @@
           ->setTag('a')
           ->setText(pht('Documentation')));
 
-    if ($service) {
-      $header->setSubheader(
-        pht(
-          'This repository is hosted on %s.',
-          phutil_tag(
-            'a',
-            array(
-              'href' => $service->getURI(),
-            ),
-            $service->getName())));
-    }
-
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)