diff --git a/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py b/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
index 8b28cac0ff7..222688da85f 100644
--- a/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
+++ b/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
@@ -85,6 +85,9 @@ class IBMStorageDriver(san.SanDriver,
     # ThirdPartySystems wiki page
     CI_WIKI_NAME = "IBM_STORAGE_CI"
 
+    # TODO(jsbryant) Remove driver in the 'U' release if CI is not fixed.
+    SUPPORTED = False
+
     def __init__(self, *args, **kwargs):
         """Initialize the driver."""
 
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
index ecf2ed3896c..864d46d1e88 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
@@ -295,11 +295,11 @@ driver.huawei_18000=complete
 driver.huawei_dorado=complete
 driver.huawei_fusionstorage=complete
 driver.infinidat=complete
-driver.ibm_ds8k=complete
+driver.ibm_ds8k=missing
 driver.ibm_flashsystem=complete
 driver.ibm_gpfs=complete
 driver.ibm_storwize=complete
-driver.ibm_xiv=complete
+driver.ibm_xiv=missing
 driver.infortrend=complete
 driver.inspur=complete
 driver.inspur_as13000=complete
diff --git a/releasenotes/notes/ibm-storage-unsupported-9e8ea6ce9cea503d.yaml b/releasenotes/notes/ibm-storage-unsupported-9e8ea6ce9cea503d.yaml
new file mode 100644
index 00000000000..217db45cd2d
--- /dev/null
+++ b/releasenotes/notes/ibm-storage-unsupported-9e8ea6ce9cea503d.yaml
@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    The IBM Storage drivers (XIV & DS8k) have been marked as unsupported
+    and are now deprecated. ``enable_unsupported_driver`` will need
+    to be set to ``True`` in the driver's section in cinder.conf to
+    continue to use them.
+deprecations:
+  - |
+    The IBM Storage drivers (XIV & DS8k) have been marked as unsupported
+    and are now deprecated. ``enable_unsupported_driver`` will need
+    to be set to ``True`` in the driver's section in cinder.conf to
+    continue to use them. If the support status does not change, the
+    drivers will be removed in the 'U' development cycle.