diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html
index 2e4fd4331..5b133d3b4 100644
--- a/app/docker/components/host-overview/host-overview.html
+++ b/app/docker/components/host-overview/host-overview.html
@@ -3,7 +3,6 @@
 <host-details-panel
   host="$ctrl.hostDetails"
   is-browse-enabled="$ctrl.isAgent && $ctrl.agentApiVersion > 1 && $ctrl.hostFeaturesEnabled"
-  environment-id="$ctrl.environmentId"
   browse-url="{{ $ctrl.browseUrl }}"
 ></host-details-panel>
 
diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js
index be93a3309..d446d71f5 100644
--- a/app/docker/components/host-overview/host-overview.js
+++ b/app/docker/components/host-overview/host-overview.js
@@ -10,7 +10,6 @@ angular.module('portainer.docker').component('hostOverview', {
     refreshUrl: '@',
     browseUrl: '@',
     hostFeaturesEnabled: '<',
-    environmentId: '<',
   },
   transclude: true,
 });
diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.html b/app/docker/components/host-view-panels/disks-panel/disks-panel.html
index 6f1b2f06c..9653cd4db 100644
--- a/app/docker/components/host-view-panels/disks-panel/disks-panel.html
+++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.html
@@ -15,9 +15,12 @@
               <td>{{ disk.Vendor }}</td>
               <td>{{ disk.Size | humansize }}</td>
             </tr>
-            <tr ng-if="!$ctrl.disks">
+            <tr ng-if="$ctrl.disks === undefined">
               <td colspan="2" class="text-muted text-center">Loading...</td>
             </tr>
+            <tr ng-if="$ctrl.disks === null">
+              <td colspan="2" class="text-muted text-center"> Failed to load devices. </td>
+            </tr>
             <tr ng-if="$ctrl.disks.length === 0">
               <td colspan="2" class="text-muted text-center"> No disks available. </td>
             </tr>
diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js
deleted file mode 100644
index 36a4fb1d5..000000000
--- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const ROOT_PATH = '/host';
-
-export class HostDetailsPanelController {
-  /* @ngInject */
-  constructor($async, HostBrowserService) {
-    Object.assign(this, { $async, HostBrowserService });
-
-    this.getFilesForPath = this.getFilesForPath.bind(this);
-    this.getFilesForPathAsync = this.getFilesForPathAsync.bind(this);
-  }
-
-  getFilesForPath(path) {
-    return this.$async(this.getFilesForPathAsync, path);
-  }
-
-  async getFilesForPathAsync(path) {
-    const isBrowseEnabledOrig = this.isBrowseEnabled;
-    this.isBrowseEnabled = false;
-
-    await this.HostBrowserService.ls(this.environmentId, path);
-    this.isBrowseEnabled = isBrowseEnabledOrig;
-  }
-
-  $onInit() {
-    this.getFilesForPath(ROOT_PATH);
-  }
-}
diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js
index 1b8f4085f..7fd43efc0 100644
--- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js
+++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js
@@ -1,12 +1,8 @@
-import { HostDetailsPanelController } from './host-details-panel-controller';
-
 angular.module('portainer.docker').component('hostDetailsPanel', {
   templateUrl: './host-details-panel.html',
-  controller: HostDetailsPanelController,
   bindings: {
     host: '<',
     isBrowseEnabled: '<',
     browseUrl: '@',
-    environmentId: '<',
   },
 });
diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html
index 745fd29fc..9e3bf854f 100644
--- a/app/docker/views/docker-features-configuration/docker-features-configuration.html
+++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html
@@ -6,10 +6,14 @@
       <rd-widget-body>
         <form class="form-horizontal" name="$ctrl.form">
           <div class="col-sm-12 form-section-title"> Host and filesystem </div>
-          <div ng-if="!$ctrl.isAgent" class="form-group">
+          <div class="form-group">
             <span class="col-sm-12 text-muted small vertical-center">
               <pr-icon icon="'info'" mode="'primary'" class-name="'space-right'"></pr-icon>
-              These features are only available for an Agent enabled environments.
+              <span class="text-muted"
+                >The environment must be <a href="https://docs.portainer.io/start/agent">running the Portainer Agent</a> to use this functionality, and the root of the host must be
+                bind-mounted to <b>/host</b> in the agent deployment. Check
+                <a href="https://docs.portainer.io/user/docker/host/setup#enable-host-management-features">our documentation</a> for more information.</span
+              >
             </span>
           </div>
           <div class="form-group">
diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html
index 2efe5e489..8895ae018 100644
--- a/app/docker/views/host/host-view.html
+++ b/app/docker/views/host/host-view.html
@@ -8,5 +8,4 @@
   refresh-url="docker.host"
   browse-url="docker.host.browser"
   host-features-enabled="$ctrl.state.enableHostManagementFeatures"
-  environment-id="$ctrl.endpoint.Id"
 ></host-overview>
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx
index a890bdfae..14f31a687 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx
@@ -122,6 +122,7 @@ docker service create \\
   --constraint 'node.platform.os == linux' \\
   --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock \\
   --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes \\
+  --mount type=bind,src=//,dst=/host \\
   portainer/agent:${agentVersion}
 `;
 }