diff --git a/src/Testcontainers/Builders/ContainerBuilder`3.cs b/src/Testcontainers/Builders/ContainerBuilder`3.cs
index b784d2eef..6df73eb1f 100644
--- a/src/Testcontainers/Builders/ContainerBuilder`3.cs
+++ b/src/Testcontainers/Builders/ContainerBuilder`3.cs
@@ -84,7 +84,7 @@ public TBuilderEntity WithImage(IImage image)
     }
 
     /// <inheritdoc />
-    public TBuilderEntity WithImagePullPolicy(Func<ImagesListResponse, bool> imagePullPolicy)
+    public TBuilderEntity WithImagePullPolicy(Func<ImageInspectResponse, bool> imagePullPolicy)
     {
       return Clone(new ContainerConfiguration(imagePullPolicy: imagePullPolicy));
     }
diff --git a/src/Testcontainers/Builders/IContainerBuilder`2.cs b/src/Testcontainers/Builders/IContainerBuilder`2.cs
index 2828ff61d..6516c3c22 100644
--- a/src/Testcontainers/Builders/IContainerBuilder`2.cs
+++ b/src/Testcontainers/Builders/IContainerBuilder`2.cs
@@ -78,7 +78,7 @@ public interface IContainerBuilder<out TBuilderEntity, out TContainerEntity> : I
     /// <param name="imagePullPolicy">The image pull policy.</param>
     /// <returns>A configured instance of <typeparamref name="TBuilderEntity" />.</returns>
     [PublicAPI]
-    TBuilderEntity WithImagePullPolicy(Func<ImagesListResponse, bool> imagePullPolicy);
+    TBuilderEntity WithImagePullPolicy(Func<ImageInspectResponse, bool> imagePullPolicy);
 
     /// <summary>
     /// Sets the name.
diff --git a/src/Testcontainers/Builders/IImageFromDockerfileBuilder`1.cs b/src/Testcontainers/Builders/IImageFromDockerfileBuilder`1.cs
index a806707d6..47f2d7131 100644
--- a/src/Testcontainers/Builders/IImageFromDockerfileBuilder`1.cs
+++ b/src/Testcontainers/Builders/IImageFromDockerfileBuilder`1.cs
@@ -59,7 +59,7 @@ public interface IImageFromDockerfileBuilder<out TBuilderEntity>
     /// <param name="imageBuildPolicy">The image build policy.</param>
     /// <returns>A configured instance of <typeparamref name="TBuilderEntity" />.</returns>
     [PublicAPI]
-    TBuilderEntity WithImageBuildPolicy(Func<ImagesListResponse, bool> imageBuildPolicy);
+    TBuilderEntity WithImageBuildPolicy(Func<ImageInspectResponse, bool> imageBuildPolicy);
 
     /// <summary>
     /// Removes an existing image before building it again.
diff --git a/src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs b/src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs
index c48a0f4f3..3b5e24da8 100644
--- a/src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs
+++ b/src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs
@@ -81,7 +81,7 @@ public ImageFromDockerfileBuilder WithDockerfileDirectory(CommonDirectoryPath co
     }
 
     /// <inheritdoc />
-    public ImageFromDockerfileBuilder WithImageBuildPolicy(Func<ImagesListResponse, bool> imageBuildPolicy)
+    public ImageFromDockerfileBuilder WithImageBuildPolicy(Func<ImageInspectResponse, bool> imageBuildPolicy)
     {
       return Merge(DockerResourceConfiguration, new ImageFromDockerfileConfiguration(imageBuildPolicy: imageBuildPolicy));
     }
diff --git a/src/Testcontainers/Clients/DockerContainerOperations.cs b/src/Testcontainers/Clients/DockerContainerOperations.cs
index 72121bee0..de7526acc 100644
--- a/src/Testcontainers/Clients/DockerContainerOperations.cs
+++ b/src/Testcontainers/Clients/DockerContainerOperations.cs
@@ -4,9 +4,9 @@ namespace DotNet.Testcontainers.Clients
   using System.Collections.Generic;
   using System.Globalization;
   using System.IO;
-  using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
+  using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;
@@ -24,37 +24,53 @@ public DockerContainerOperations(Guid sessionId, IDockerEndpointAuthenticationCo
 
     public async Task<IEnumerable<ContainerListResponse>> GetAllAsync(CancellationToken ct = default)
     {
-      return (await Docker.Containers.ListContainersAsync(new ContainersListParameters { All = true }, ct)
-        .ConfigureAwait(false)).ToArray();
+      return await Docker.Containers.ListContainersAsync(new ContainersListParameters { All = true }, ct)
+        .ConfigureAwait(false);
+    }
+
+    public async Task<IEnumerable<ContainerListResponse>> GetAllAsync(FilterByProperty filters, CancellationToken ct = default)
+    {
+      return await Docker.Containers.ListContainersAsync(new ContainersListParameters { All = true, Filters = filters }, ct)
+        .ConfigureAwait(false);
     }
 
-    public Task<ContainerListResponse> ByIdAsync(string id, CancellationToken ct = default)
+    public Task<ContainerInspectResponse> ByIdAsync(string id, CancellationToken ct = default)
     {
       return ByPropertyAsync("id", id, ct);
     }
 
-    public Task<ContainerListResponse> ByNameAsync(string name, CancellationToken ct = default)
+    public Task<ContainerInspectResponse> ByNameAsync(string name, CancellationToken ct = default)
     {
       return ByPropertyAsync("name", name, ct);
     }
 
-    public async Task<ContainerListResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
+    public async Task<ContainerInspectResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
     {
-      var filters = new FilterByProperty { { property, value } };
-      return (await Docker.Containers.ListContainersAsync(new ContainersListParameters { All = true, Filters = filters }, ct)
-        .ConfigureAwait(false)).FirstOrDefault();
+      try
+      {
+        return await Docker.Containers.InspectContainerAsync(value, ct)
+          .ConfigureAwait(false);
+      }
+      catch (DockerApiException)
+      {
+        return null;
+      }
     }
 
     public async Task<bool> ExistsWithIdAsync(string id, CancellationToken ct = default)
     {
-      return await ByIdAsync(id, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByIdAsync(id, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<bool> ExistsWithNameAsync(string name, CancellationToken ct = default)
     {
-      return await ByNameAsync(name, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByNameAsync(name, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<long> GetExitCodeAsync(string id, CancellationToken ct = default)
@@ -214,10 +230,5 @@ public async Task<string> RunAsync(IContainerConfiguration configuration, Cancel
       _logger.DockerContainerCreated(createContainerResponse.ID);
       return createContainerResponse.ID;
     }
-
-    public Task<ContainerInspectResponse> InspectAsync(string id, CancellationToken ct = default)
-    {
-      return Docker.Containers.InspectContainerAsync(id, ct);
-    }
   }
 }
diff --git a/src/Testcontainers/Clients/DockerImageOperations.cs b/src/Testcontainers/Clients/DockerImageOperations.cs
index 8d8a537ac..f469bd569 100644
--- a/src/Testcontainers/Clients/DockerImageOperations.cs
+++ b/src/Testcontainers/Clients/DockerImageOperations.cs
@@ -6,6 +6,7 @@ namespace DotNet.Testcontainers.Clients
   using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
+  using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Images;
@@ -26,38 +27,53 @@ public DockerImageOperations(Guid sessionId, IDockerEndpointAuthenticationConfig
 
     public async Task<IEnumerable<ImagesListResponse>> GetAllAsync(CancellationToken ct = default)
     {
-      return (await Docker.Images.ListImagesAsync(new ImagesListParameters { All = true }, ct)
-        .ConfigureAwait(false)).ToArray();
+      return await Docker.Images.ListImagesAsync(new ImagesListParameters { All = true }, ct)
+        .ConfigureAwait(false);
+    }
+
+    public async Task<IEnumerable<ImagesListResponse>> GetAllAsync(FilterByProperty filters, CancellationToken ct = default)
+    {
+      return await Docker.Images.ListImagesAsync(new ImagesListParameters { All = true, Filters = filters }, ct)
+        .ConfigureAwait(false);
     }
 
-    public async Task<ImagesListResponse> ByIdAsync(string id, CancellationToken ct = default)
+    public Task<ImageInspectResponse> ByIdAsync(string id, CancellationToken ct = default)
     {
-      return (await GetAllAsync(ct)
-        .ConfigureAwait(false)).FirstOrDefault(image => image.ID.Equals(id, StringComparison.OrdinalIgnoreCase));
+      return ByPropertyAsync("id", id, ct);
     }
 
-    public Task<ImagesListResponse> ByNameAsync(string name, CancellationToken ct = default)
+    public Task<ImageInspectResponse> ByNameAsync(string name, CancellationToken ct = default)
     {
       return ByPropertyAsync("reference", name, ct);
     }
 
-    public async Task<ImagesListResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
+    public async Task<ImageInspectResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
     {
-      var filters = new FilterByProperty { { property, value } };
-      return (await Docker.Images.ListImagesAsync(new ImagesListParameters { All = true, Filters = filters }, ct)
-        .ConfigureAwait(false)).FirstOrDefault();
+      try
+      {
+        return await Docker.Images.InspectImageAsync(value, ct)
+          .ConfigureAwait(false);
+      }
+      catch (DockerApiException)
+      {
+        return null;
+      }
     }
 
     public async Task<bool> ExistsWithIdAsync(string id, CancellationToken ct = default)
     {
-      return await ByIdAsync(id, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByIdAsync(id, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<bool> ExistsWithNameAsync(string name, CancellationToken ct = default)
     {
-      return await ByNameAsync(name, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByNameAsync(name, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task CreateAsync(IImage image, IDockerRegistryAuthenticationConfiguration dockerRegistryAuthConfig, CancellationToken ct = default)
diff --git a/src/Testcontainers/Clients/DockerNetworkOperations.cs b/src/Testcontainers/Clients/DockerNetworkOperations.cs
index 661105613..503db9c0e 100644
--- a/src/Testcontainers/Clients/DockerNetworkOperations.cs
+++ b/src/Testcontainers/Clients/DockerNetworkOperations.cs
@@ -5,6 +5,7 @@ namespace DotNet.Testcontainers.Clients
   using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
+  using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using Microsoft.Extensions.Logging;
@@ -21,14 +22,19 @@ public DockerNetworkOperations(Guid sessionId, IDockerEndpointAuthenticationConf
 
     public async Task<IEnumerable<NetworkResponse>> GetAllAsync(CancellationToken ct = default)
     {
-      return (await Docker.Networks.ListNetworksAsync(new NetworksListParameters(), ct)
-        .ConfigureAwait(false)).ToArray();
+      return await Docker.Networks.ListNetworksAsync(new NetworksListParameters(), ct)
+        .ConfigureAwait(false);
     }
 
-    public async Task<NetworkResponse> ByIdAsync(string id, CancellationToken ct = default)
+    public async Task<IEnumerable<NetworkResponse>> GetAllAsync(FilterByProperty filters, CancellationToken ct = default)
     {
-      return (await GetAllAsync(ct)
-        .ConfigureAwait(false)).FirstOrDefault(image => image.ID.Equals(id, StringComparison.OrdinalIgnoreCase));
+      return await Docker.Networks.ListNetworksAsync(new NetworksListParameters { Filters = filters }, ct)
+        .ConfigureAwait(false);
+    }
+
+    public Task<NetworkResponse> ByIdAsync(string id, CancellationToken ct = default)
+    {
+      return ByPropertyAsync("id", id, ct);
     }
 
     public Task<NetworkResponse> ByNameAsync(string name, CancellationToken ct = default)
@@ -38,21 +44,31 @@ public Task<NetworkResponse> ByNameAsync(string name, CancellationToken ct = def
 
     public async Task<NetworkResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
     {
-      var filters = new FilterByProperty { { property, value } };
-      return (await Docker.Networks.ListNetworksAsync(new NetworksListParameters { Filters = filters }, ct)
-        .ConfigureAwait(false)).FirstOrDefault();
+      try
+      {
+        return await Docker.Networks.InspectNetworkAsync(value, ct)
+          .ConfigureAwait(false);
+      }
+      catch (DockerApiException)
+      {
+        return null;
+      }
     }
 
     public async Task<bool> ExistsWithIdAsync(string id, CancellationToken ct = default)
     {
-      return await ByIdAsync(id, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByIdAsync(id, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<bool> ExistsWithNameAsync(string name, CancellationToken ct = default)
     {
-      return await ByNameAsync(name, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByNameAsync(name, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<string> CreateAsync(INetworkConfiguration configuration, CancellationToken ct = default)
diff --git a/src/Testcontainers/Clients/DockerVolumeOperations.cs b/src/Testcontainers/Clients/DockerVolumeOperations.cs
index cd31e0cf4..4224bd92b 100644
--- a/src/Testcontainers/Clients/DockerVolumeOperations.cs
+++ b/src/Testcontainers/Clients/DockerVolumeOperations.cs
@@ -5,6 +5,7 @@ namespace DotNet.Testcontainers.Clients
   using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
+  using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using Microsoft.Extensions.Logging;
@@ -21,13 +22,23 @@ public DockerVolumeOperations(Guid sessionId, IDockerEndpointAuthenticationConfi
 
     public async Task<IEnumerable<VolumeResponse>> GetAllAsync(CancellationToken ct = default)
     {
-      return (await Docker.Volumes.ListAsync(ct)
-        .ConfigureAwait(false)).Volumes.ToArray();
+      var response = await Docker.Volumes.ListAsync(ct)
+        .ConfigureAwait(false);
+
+      return response.Volumes;
+    }
+
+    public async Task<IEnumerable<VolumeResponse>> GetAllAsync(FilterByProperty filters, CancellationToken ct = default)
+    {
+      var response = await Docker.Volumes.ListAsync(new VolumesListParameters { Filters = filters }, ct)
+        .ConfigureAwait(false);
+
+      return response.Volumes;
     }
 
     public Task<VolumeResponse> ByIdAsync(string id, CancellationToken ct = default)
     {
-      return Task.FromResult<VolumeResponse>(null);
+      return ByPropertyAsync("id", id, ct);
     }
 
     public Task<VolumeResponse> ByNameAsync(string name, CancellationToken ct = default)
@@ -37,21 +48,31 @@ public Task<VolumeResponse> ByNameAsync(string name, CancellationToken ct = defa
 
     public async Task<VolumeResponse> ByPropertyAsync(string property, string value, CancellationToken ct = default)
     {
-      var filters = new FilterByProperty { { property, value } };
-      return (await Docker.Volumes.ListAsync(new VolumesListParameters { Filters = filters }, ct)
-        .ConfigureAwait(false)).Volumes.FirstOrDefault();
+      try
+      {
+        return await Docker.Volumes.InspectAsync(value, ct)
+          .ConfigureAwait(false);
+      }
+      catch (DockerApiException)
+      {
+        return null;
+      }
     }
 
     public async Task<bool> ExistsWithIdAsync(string id, CancellationToken ct = default)
     {
-      return await ByIdAsync(id, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByIdAsync(id, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<bool> ExistsWithNameAsync(string name, CancellationToken ct = default)
     {
-      return await ByNameAsync(name, ct)
-        .ConfigureAwait(false) != null;
+      var response = await ByNameAsync(name, ct)
+        .ConfigureAwait(false);
+
+      return response != null;
     }
 
     public async Task<string> CreateAsync(IVolumeConfiguration configuration, CancellationToken ct = default)
diff --git a/src/Testcontainers/Clients/IDockerContainerOperations.cs b/src/Testcontainers/Clients/IDockerContainerOperations.cs
index ea833ee08..1557074a7 100644
--- a/src/Testcontainers/Clients/IDockerContainerOperations.cs
+++ b/src/Testcontainers/Clients/IDockerContainerOperations.cs
@@ -9,7 +9,7 @@ namespace DotNet.Testcontainers.Clients
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;
 
-  internal interface IDockerContainerOperations : IHasListOperations<ContainerListResponse>
+  internal interface IDockerContainerOperations : IHasListOperations<ContainerListResponse, ContainerInspectResponse>
   {
     Task<long> GetExitCodeAsync(string id, CancellationToken ct = default);
 
@@ -30,7 +30,5 @@ internal interface IDockerContainerOperations : IHasListOperations<ContainerList
     Task<ExecResult> ExecAsync(string id, IList<string> command, CancellationToken ct = default);
 
     Task<string> RunAsync(IContainerConfiguration configuration, CancellationToken ct = default);
-
-    Task<ContainerInspectResponse> InspectAsync(string id, CancellationToken ct = default);
   }
 }
diff --git a/src/Testcontainers/Clients/IDockerImageOperations.cs b/src/Testcontainers/Clients/IDockerImageOperations.cs
index bb94950f2..f93cdf70d 100644
--- a/src/Testcontainers/Clients/IDockerImageOperations.cs
+++ b/src/Testcontainers/Clients/IDockerImageOperations.cs
@@ -6,7 +6,7 @@ namespace DotNet.Testcontainers.Clients
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Images;
 
-  internal interface IDockerImageOperations : IHasListOperations<ImagesListResponse>
+  internal interface IDockerImageOperations : IHasListOperations<ImagesListResponse, ImageInspectResponse>
   {
     Task CreateAsync(IImage image, IDockerRegistryAuthenticationConfiguration dockerRegistryAuthConfig, CancellationToken ct = default);
 
diff --git a/src/Testcontainers/Clients/IDockerNetworkOperations.cs b/src/Testcontainers/Clients/IDockerNetworkOperations.cs
index 9f4fe6afb..b9cfb4bf0 100644
--- a/src/Testcontainers/Clients/IDockerNetworkOperations.cs
+++ b/src/Testcontainers/Clients/IDockerNetworkOperations.cs
@@ -5,7 +5,7 @@ namespace DotNet.Testcontainers.Clients
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
 
-  internal interface IDockerNetworkOperations : IHasListOperations<NetworkResponse>
+  internal interface IDockerNetworkOperations : IHasListOperations<NetworkResponse, NetworkResponse>
   {
     Task<string> CreateAsync(INetworkConfiguration configuration, CancellationToken ct = default);
 
diff --git a/src/Testcontainers/Clients/IDockerVolumeOperations.cs b/src/Testcontainers/Clients/IDockerVolumeOperations.cs
index e9fbee316..05a63de08 100644
--- a/src/Testcontainers/Clients/IDockerVolumeOperations.cs
+++ b/src/Testcontainers/Clients/IDockerVolumeOperations.cs
@@ -5,7 +5,7 @@ namespace DotNet.Testcontainers.Clients
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
 
-  internal interface IDockerVolumeOperations : IHasListOperations<VolumeResponse>
+  internal interface IDockerVolumeOperations : IHasListOperations<VolumeResponse, VolumeResponse>
   {
     Task<string> CreateAsync(IVolumeConfiguration configuration, CancellationToken ct = default);
 
diff --git a/src/Testcontainers/Clients/IHasListOperations.cs b/src/Testcontainers/Clients/IHasListOperations.cs
index 6a5f07db3..e22229e6b 100644
--- a/src/Testcontainers/Clients/IHasListOperations.cs
+++ b/src/Testcontainers/Clients/IHasListOperations.cs
@@ -4,15 +4,17 @@ namespace DotNet.Testcontainers.Clients
   using System.Threading;
   using System.Threading.Tasks;
 
-  internal interface IHasListOperations<T>
+  internal interface IHasListOperations<TListEntity, TInspectEntity>
   {
-    Task<IEnumerable<T>> GetAllAsync(CancellationToken ct = default);
+    Task<IEnumerable<TListEntity>> GetAllAsync(CancellationToken ct = default);
 
-    Task<T> ByIdAsync(string id, CancellationToken ct = default);
+    Task<IEnumerable<TListEntity>> GetAllAsync(FilterByProperty filters, CancellationToken ct = default);
 
-    Task<T> ByNameAsync(string name, CancellationToken ct = default);
+    Task<TInspectEntity> ByIdAsync(string id, CancellationToken ct = default);
 
-    Task<T> ByPropertyAsync(string property, string value, CancellationToken ct = default);
+    Task<TInspectEntity> ByNameAsync(string name, CancellationToken ct = default);
+
+    Task<TInspectEntity> ByPropertyAsync(string property, string value, CancellationToken ct = default);
 
     Task<bool> ExistsWithIdAsync(string id, CancellationToken ct = default);
 
diff --git a/src/Testcontainers/Clients/ITestcontainersClient.cs b/src/Testcontainers/Clients/ITestcontainersClient.cs
index dcb8b6554..1cc5c641b 100644
--- a/src/Testcontainers/Clients/ITestcontainersClient.cs
+++ b/src/Testcontainers/Clients/ITestcontainersClient.cs
@@ -5,7 +5,6 @@ namespace DotNet.Testcontainers.Clients
   using System.IO;
   using System.Threading;
   using System.Threading.Tasks;
-  using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;
 
@@ -63,14 +62,6 @@ internal interface ITestcontainersClient
     /// <returns>Task that gets the container logs.</returns>
     Task<(string Stdout, string Stderr)> GetContainerLogsAsync(string id, DateTime since = default, DateTime until = default, bool timestampsEnabled = true, CancellationToken ct = default);
 
-    /// <summary>
-    /// Gets the container low-level information object.
-    /// </summary>
-    /// <param name="id">The container id.</param>
-    /// <param name="ct">Cancellation token.</param>
-    /// <returns>Task that gets the container low-level information object.</returns>
-    Task<ContainerInspectResponse> InspectContainerAsync(string id, CancellationToken ct = default);
-
     /// <summary>
     /// Starts the container.
     /// </summary>
diff --git a/src/Testcontainers/Clients/TestcontainersClient.cs b/src/Testcontainers/Clients/TestcontainersClient.cs
index 9ff769a47..2d9e45587 100644
--- a/src/Testcontainers/Clients/TestcontainersClient.cs
+++ b/src/Testcontainers/Clients/TestcontainersClient.cs
@@ -9,7 +9,6 @@ namespace DotNet.Testcontainers.Clients
   using System.Threading;
   using System.Threading.Tasks;
   using Docker.DotNet;
-  using Docker.DotNet.Models;
   using DotNet.Testcontainers.Builders;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;
@@ -118,12 +117,6 @@ public Task<long> GetContainerExitCodeAsync(string id, CancellationToken ct = de
       return Container.GetLogsAsync(id, since.ToUniversalTime().Subtract(unixEpoch), until.ToUniversalTime().Subtract(unixEpoch), timestampsEnabled, ct);
     }
 
-    /// <inheritdoc />
-    public Task<ContainerInspectResponse> InspectContainerAsync(string id, CancellationToken ct = default)
-    {
-      return Container.InspectAsync(id, ct);
-    }
-
     /// <inheritdoc />
     public async Task StartAsync(string id, CancellationToken ct = default)
     {
diff --git a/src/Testcontainers/Configurations/Containers/ContainerConfiguration.cs b/src/Testcontainers/Configurations/Containers/ContainerConfiguration.cs
index 46b3c4b94..0a4b6092d 100644
--- a/src/Testcontainers/Configurations/Containers/ContainerConfiguration.cs
+++ b/src/Testcontainers/Configurations/Containers/ContainerConfiguration.cs
@@ -42,7 +42,7 @@ public class ContainerConfiguration : ResourceConfiguration<CreateContainerParam
     /// <param name="privileged">A value indicating whether the privileged flag is set or not.</param>
     public ContainerConfiguration(
       IImage image = null,
-      Func<ImagesListResponse, bool> imagePullPolicy = null,
+      Func<ImageInspectResponse, bool> imagePullPolicy = null,
       string name = null,
       string hostname = null,
       string macAddress = null,
@@ -148,7 +148,7 @@ public ContainerConfiguration(IContainerConfiguration oldValue, IContainerConfig
     public IImage Image { get; }
 
     /// <inheritdoc />
-    public Func<ImagesListResponse, bool> ImagePullPolicy { get; }
+    public Func<ImageInspectResponse, bool> ImagePullPolicy { get; }
 
     /// <inheritdoc />
     public string Name { get; }
diff --git a/src/Testcontainers/Configurations/Containers/IContainerConfiguration.cs b/src/Testcontainers/Configurations/Containers/IContainerConfiguration.cs
index 830f1668b..8c10cb360 100644
--- a/src/Testcontainers/Configurations/Containers/IContainerConfiguration.cs
+++ b/src/Testcontainers/Configurations/Containers/IContainerConfiguration.cs
@@ -34,7 +34,7 @@ public interface IContainerConfiguration : IResourceConfiguration<CreateContaine
     /// <summary>
     /// Gets the image pull policy.
     /// </summary>
-    Func<ImagesListResponse, bool> ImagePullPolicy { get; }
+    Func<ImageInspectResponse, bool> ImagePullPolicy { get; }
 
     /// <summary>
     /// Gets the name.
diff --git a/src/Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs b/src/Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs
index 8f27b3aef..eac754820 100644
--- a/src/Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs
+++ b/src/Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs
@@ -35,7 +35,7 @@ public interface IImageFromDockerfileConfiguration : IResourceConfiguration<Imag
     /// <summary>
     /// Gets the image build policy.
     /// </summary>
-    Func<ImagesListResponse, bool> ImageBuildPolicy { get; }
+    Func<ImageInspectResponse, bool> ImageBuildPolicy { get; }
 
     /// <summary>
     /// Gets a list of build arguments.
diff --git a/src/Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs b/src/Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs
index 2677afe2c..9203c30d9 100644
--- a/src/Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs
+++ b/src/Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs
@@ -24,7 +24,7 @@ public ImageFromDockerfileConfiguration(
       string dockerfile = null,
       string dockerfileDirectory = null,
       IImage image = null,
-      Func<ImagesListResponse, bool> imageBuildPolicy = null,
+      Func<ImageInspectResponse, bool> imageBuildPolicy = null,
       IReadOnlyDictionary<string, string> buildArguments = null,
       bool? deleteIfExists = null)
     {
@@ -83,7 +83,7 @@ public ImageFromDockerfileConfiguration(IImageFromDockerfileConfiguration oldVal
     public IImage Image { get; }
 
     /// <inheritdoc />
-    public Func<ImagesListResponse, bool> ImageBuildPolicy { get; }
+    public Func<ImageInspectResponse, bool> ImageBuildPolicy { get; }
 
     /// <inheritdoc />
     public IReadOnlyDictionary<string, string> BuildArguments { get; }
diff --git a/src/Testcontainers/Containers/DockerContainer.cs b/src/Testcontainers/Containers/DockerContainer.cs
index 3127a9962..e7db53b33 100644
--- a/src/Testcontainers/Containers/DockerContainer.cs
+++ b/src/Testcontainers/Containers/DockerContainer.cs
@@ -368,7 +368,7 @@ protected override async Task UnsafeCreateAsync(CancellationToken ct = default)
       var id = await _client.RunAsync(_configuration, ct)
         .ConfigureAwait(false);
 
-      _container = await _client.InspectContainerAsync(id, ct)
+      _container = await _client.Container.ByIdAsync(id, ct)
         .ConfigureAwait(false);
 
       Created?.Invoke(this, EventArgs.Empty);
@@ -407,7 +407,7 @@ protected virtual async Task UnsafeStartAsync(CancellationToken ct = default)
 
       async Task<bool> CheckPortBindingsAsync()
       {
-        _container = await _client.InspectContainerAsync(_container.ID, ct)
+        _container = await _client.Container.ByIdAsync(_container.ID, ct)
           .ConfigureAwait(false);
 
         var boundPorts = _container.NetworkSettings.Ports.Values.Where(portBindings => portBindings != null).SelectMany(portBinding => portBinding).Count(portBinding => !string.IsNullOrEmpty(portBinding.HostPort));
@@ -416,7 +416,7 @@ async Task<bool> CheckPortBindingsAsync()
 
       async Task<bool> CheckWaitStrategyAsync(IWaitUntil wait)
       {
-        _container = await _client.InspectContainerAsync(_container.ID, ct)
+        _container = await _client.Container.ByIdAsync(_container.ID, ct)
           .ConfigureAwait(false);
 
         return await wait.UntilAsync(this)
@@ -474,7 +474,7 @@ await _client.StopAsync(_container.ID, ct)
 
       try
       {
-        _container = await _client.InspectContainerAsync(_container.ID, ct)
+        _container = await _client.Container.ByIdAsync(_container.ID, ct)
           .ConfigureAwait(false);
       }
       catch (DockerApiException)
diff --git a/src/Testcontainers/Images/FutureDockerImage.cs b/src/Testcontainers/Images/FutureDockerImage.cs
index 4352f6f15..bb3b2be13 100644
--- a/src/Testcontainers/Images/FutureDockerImage.cs
+++ b/src/Testcontainers/Images/FutureDockerImage.cs
@@ -16,7 +16,7 @@ internal sealed class FutureDockerImage : Resource, IFutureDockerImage
 
     private readonly IImageFromDockerfileConfiguration _configuration;
 
-    private ImagesListResponse _image = new ImagesListResponse();
+    private ImageInspectResponse _image = new ImageInspectResponse();
 
     /// <summary>
     /// Initializes a new instance of the <see cref="FutureDockerImage" /> class.
@@ -132,7 +132,7 @@ protected override async Task UnsafeDeleteAsync(CancellationToken ct = default)
       await _client.Image.DeleteAsync(_configuration.Image, ct)
         .ConfigureAwait(false);
 
-      _image = new ImagesListResponse();
+      _image = new ImageInspectResponse();
     }
   }
 }
diff --git a/src/Testcontainers/Images/PullPolicy.cs b/src/Testcontainers/Images/PullPolicy.cs
index 9b879f54f..b5a852d2c 100644
--- a/src/Testcontainers/Images/PullPolicy.cs
+++ b/src/Testcontainers/Images/PullPolicy.cs
@@ -13,7 +13,7 @@ public static class PullPolicy
     /// <summary>
     /// Gets the policy that never pulls images.
     /// </summary>
-    public static Func<ImagesListResponse, bool> Never
+    public static Func<ImageInspectResponse, bool> Never
     {
       get
       {
@@ -24,7 +24,7 @@ public static Func<ImagesListResponse, bool> Never
     /// <summary>
     /// Gets the policy that pulls missing images (not cached).
     /// </summary>
-    public static Func<ImagesListResponse, bool> Missing
+    public static Func<ImageInspectResponse, bool> Missing
     {
       get
       {
@@ -35,7 +35,7 @@ public static Func<ImagesListResponse, bool> Missing
     /// <summary>
     /// Gets the policy that always pulls images.
     /// </summary>
-    public static Func<ImagesListResponse, bool> Always
+    public static Func<ImageInspectResponse, bool> Always
     {
       get
       {
diff --git a/src/Testcontainers/Volumes/DockerVolume.cs b/src/Testcontainers/Volumes/DockerVolume.cs
index 91c2aeeed..b161c0e8e 100644
--- a/src/Testcontainers/Volumes/DockerVolume.cs
+++ b/src/Testcontainers/Volumes/DockerVolume.cs
@@ -94,10 +94,10 @@ protected override async Task UnsafeCreateAsync(CancellationToken ct = default)
         return;
       }
 
-      var name = await _client.Volume.CreateAsync(_configuration, ct)
+      var id = await _client.Volume.CreateAsync(_configuration, ct)
         .ConfigureAwait(false);
 
-      _volume = await _client.Volume.ByNameAsync(name, ct)
+      _volume = await _client.Volume.ByIdAsync(id, ct)
         .ConfigureAwait(false);
     }