diff --git a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
index 10d9f4c5f1..5b5820641c 100755
--- a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
@@ -17,10 +17,11 @@ class Mvapich2Gdr(AutotoolsPackage):
     """
 
     homepage = 'http://mvapich.cse.ohio-state.edu'
-    url      = 'http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2-gdr/mvapich2-gdr-2.3.5.tar.gz'
+    url      = 'http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2-gdr/mvapich2-gdr-2.3.6.tar.gz'
 
     maintainers = ['ndcontini', 'natshineman', 'harisubramoni']
 
+    version('2.3.6', sha256='618408431348164c0824f3a72dc406763f169f7f5400f3cc15dfebf8d7166005')
     version('2.3.5', sha256='bcfe8197875405af0ddbf6462e585efc21668108bec9b481fe53616ad36a98b4')
     version('2.3.4', sha256='ed78101e6bb807e979213006ee5f20ff466369b01f96b6d1cf0c471baf7e35aa')
     version('2.3.3', sha256='9b7b5dd235dbf85099fba3b6f1ccb49bb755923efed66ddc335921f44cb1b8a8')
@@ -90,9 +91,9 @@ class Mvapich2Gdr(AutotoolsPackage):
     depends_on('bison@3.4.2', type='build')
     depends_on('libpciaccess@0.13.5', when=(sys.platform != 'darwin'))
     depends_on('libxml2@2.9.10')
-    depends_on('cuda@9.2.88:11.1.1', when='+cuda')
+    depends_on('cuda@9.2.88:11.2.2', when='+cuda')
     depends_on('pmix@3.1.3', when='pmi_version=pmix')
-    depends_on('hip@3.9.0:4.0.0', when='+rocm')
+    depends_on('hip@3.9.0:4.1.0', when='+rocm')
 
     filter_compiler_wrappers(
         'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin'
@@ -127,6 +128,7 @@ def process_manager_options(self):
 
         if '+cuda' in spec:
             opts.append('--enable-cuda')
+            opts.append('--disable-gl')
             opts.append('--with-cuda={0}'.format(spec['cuda'].prefix))
 
         if '+rocm' in spec:
@@ -203,13 +205,12 @@ def setup_dependent_package(self, module, dependent_spec):
         ]
 
     def configure_args(self):
-        args = ['--disable-hybrid',
-                '--with-ch3-rank-bits=32',
-                '--disable-gl',
-                '--without-hydra-ckpointlib',
-                '--disable-static',
-                '--enable-shared',
-                '--disable-rdma-cm'
-                ]
+        args = [
+            '--with-ch3-rank-bits=32',
+            '--without-hydra-ckpointlib',
+            '--disable-static',
+            '--enable-shared',
+            '--disable-rdma-cm'
+        ]
         args.extend(self.process_manager_options)
         return args