diff --git a/HISTORY.rst b/HISTORY.rst
index e2a97e0..8e880a0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -10,6 +10,7 @@ History
   - Use NOS-Brick to setup OS-Brick for non OpenStack usage.
   - Can setup persistence directly to use key-value storage.
   - Support loading objects without configured backend.
+  - Support for Cinder Queens, Rocky, and Master
 
 - Bug fixes:
 
diff --git a/TODO.rst b/TODO.rst
index 4e03a83..3709d70 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -14,7 +14,6 @@ list to keep track of the most relevant topics.
 - Parameter validation
 - Support using *cinderlib* without cinder to just handle the attach/detach
 - Add .py examples
-- Support other Cinder releases besides Pike
 - Add support for new Attach/Detach mechanism
 - Consistency Groups
 - Encryption
diff --git a/requirements_dev.txt b/requirements_dev.txt
index bd2d06c..97a2462 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -10,4 +10,4 @@ coverage==4.1
 Sphinx==1.6.5
 mock==2.0.0
 readme_renderer==21.0
-git+https://github.com/openstack/cinder.git@stable/pike
+git+https://github.com/openstack/cinder.git
diff --git a/setup.py b/setup.py
index e3db4d6..b4b8346 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
 requirements = [
-    'cinder>=11.0,<12.0',
+    'cinder>=11.0',
     'nos-brick',
 ]
 
diff --git a/tests/functional/lvm.yaml b/tests/functional/lvm.yaml
index ae1e955..618a85f 100644
--- a/tests/functional/lvm.yaml
+++ b/tests/functional/lvm.yaml
@@ -15,5 +15,5 @@ backends:
     - volume_backend_name: lvm
       volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
       volume_group: cinder-volumes
-      iscsi_protocol: iscsi
-      iscsi_helper: lioadm
+      target_protocol: iscsi
+      target_helper: lioadm
diff --git a/tox.ini b/tox.ini
index d156812..74f83f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps=
 
 [testenv]
 usedevelop=True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/cinderlib
 deps= -r{toxinidir}/requirements_dev.txt