diff --git a/requirements.txt b/requirements.txt
index dfc7a60..4637f65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ h11<0.13,>=0.11 # MIT
 MarkupSafe>=2.0.1,<=2.1.1 # BSD License (3 clause)
 python-multipart>=0.0.5 # Apache-2.0
 python-keystoneclient>=3.21.0 # Apache-2.0
-python-cinderclient>=5.0.2 # Apache-2.0
+python-cinderclient>=8.1.0 # Apache-2.0
 python-glanceclient>=2.17.1 # Apache-2.0
 python-neutronclient>=6.14.1 # Apache-2.0
 python-novaclient>=15.1.1 # Apache-2.0
diff --git a/skyline_apiserver/api/v1/extension.py b/skyline_apiserver/api/v1/extension.py
index 597b3d9..efc8fee 100644
--- a/skyline_apiserver/api/v1/extension.py
+++ b/skyline_apiserver/api/v1/extension.py
@@ -632,13 +632,6 @@ async def list_volumes(
     )
     result = []
     server_ids = []
-    # commit: https://review.opendev.org/c/openstack/python-cinderclient/+/767451
-    # here is just a workaround way.
-    while True:
-        if volumes and isinstance(volumes[-1], int):
-            volumes = volumes[0]
-        else:
-            break
     for volume in volumes:
         origin_data = OSVolume(volume).to_dict()
         volume = Volume(volume).to_dict()
@@ -798,13 +791,6 @@ async def list_volume_snapshots(
     result = []
     volume_ids = []
     snapshot_ids = []
-    # commit: https://review.opendev.org/c/openstack/python-cinderclient/+/767451
-    # here is just a workaround way.
-    while True:
-        if volume_snapshots and isinstance(volume_snapshots[-1], int):
-            volume_snapshots = volume_snapshots[0]
-        else:
-            break
     for volume_snapshot in volume_snapshots:
         origin_data = OSVolumeSnapshot(volume_snapshot).to_dict()
         volume_snapshot = VolumeSnapshot(volume_snapshot).to_dict()