diff --git a/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py b/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
index 13738401366..7a2c443ef05 100644
--- a/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
+++ b/cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
@@ -587,7 +587,7 @@ class DS8KCommonHelper(object):
 
     def _get_host(self, connector):
         # DS8K doesn't support hostname which is longer than 32 chars.
-        hname = ('OShost:%s' % filter_alnum(connector['host']))[:32]
+        hname = filter_alnum(connector['host'])[:32]
         os_type = connector.get('os_type')
         platform = connector.get('platform')
 
@@ -597,7 +597,7 @@ class DS8KCommonHelper(object):
             htype = 'iSeries'
         elif os_type == 'AIX':
             htype = 'pSeries'
-        elif platform in ('s390', 's390x') and os_type == 'linux2':
+        elif platform in ('s390', 's390x') and os_type in ('linux', 'linux2'):
             htype = 'zLinux'
         else:
             htype = 'LinuxRHEL'
diff --git a/releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml b/releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml
new file mode 100644
index 00000000000..f1221cb2afa
--- /dev/null
+++ b/releasenotes/notes/bug-1903648-ds8k-ostype-compatability-support-a86f608d8c014a29.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    IBM DS8000 Driver `Bug #1903648
+    <https://bugs.launchpad.net/cinder/+bug/1903648>`_:
+    Fix os_type compatability and hostname template issue.