diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a72b92a03fe8a118a1ad82c8e02ad9cc8cb52b9..1b66aa7a12e8ce1c4ae883d222e3d04db00fd35d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ deploy-int-release-dev-cscs:
     INSTALLATION_ROOT: /srv/test-build-2309
     SPACK_ENV: test
     RELEASE_NAME: EBRAINS-test
-  resource_group: shared-NFS-mount-dev-cscs-spack20
+  resource_group: shared-NFS-mount-dev-cscs
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/
 
@@ -112,7 +112,7 @@ deploy-exp-release-dev-cscs:
     INSTALLATION_ROOT: /srv/test-build-2309
     SPACK_ENV: experimental
     RELEASE_NAME: EBRAINS-experimental
-  resource_group: shared-NFS-mount-dev-cscs-spack20
+  resource_group: shared-NFS-mount-dev-cscs
   only:
     refs:
       - schedules
diff --git a/packages/ambertools/package.py b/packages/ambertools/package.py
index 28c84d580d77b3b4e20f742e55b5d8d5a5abbc7d..87e4c39e822c3df1fa37fa081b43dfdf3e0d5f62 100644
--- a/packages/ambertools/package.py
+++ b/packages/ambertools/package.py
@@ -7,8 +7,8 @@ class Ambertools (CMakePackage):
     The libsander and libpbsa libraries use the LGPL license."""
 
     # Set the homepage and download url
-    homepage = "https://ambermd.org/AmberTools.php"
-    url      = "https://ambermd.org/downloads/AmberTools22jlmrcc.tar.bz2"
+    homepage = "http://ambermd.org/AmberTools.php"
+    url      = "http://ambermd.org/downloads/AmberTools22jlmrcc.tar.bz2"
 
     # Set the gitlab accounts of this package maintainers
     maintainers = ['dbeltran', 'elmath']
diff --git a/packages/nest/package.py b/packages/nest/package.py
index 3f571164da86fe7c344afb81e96af35b4cee649f..6cf3ccb381289c5f27356e74a1ff95cf52893701 100644
--- a/packages/nest/package.py
+++ b/packages/nest/package.py
@@ -28,7 +28,7 @@ class Nest(CMakePackage):
     maintainers = ['terhorst']
 
     version('master', branch='master')
-    version('3.6-rc2',sha256='8508a9590ad49e6657809d1acfd02aa612b70fa8e5e7791a2ea261d891f181f7')
+    version('3.6',    sha256='68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922')
     version('3.5',    sha256='3cdf5720854a4d8a7d359f9de9d2fb3619a0be2e36932028d6940360741547bd')
     version('3.4',    sha256='c56699111f899045ba48e55e87d14eca8763b48ebbb3648beee701a36aa3af20')
     version('3.3',    sha256='179462b966cc61f5785d2fee770bc36f86745598ace9cd97dd620622b62043ed')
diff --git a/spack.yaml b/spack.yaml
index ab828d5e13a1087726741d07378ef5aa9b43efa6..94e3dbd67e5ca3c6dd3720347b7e1b58fe53961c 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,7 +13,7 @@ spack:
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
     - hxtorch@7.0-rc1
-    - nest@3.6-rc2 +sonata
+    - nest@3.6 +sonata
     - neuron@8.2.3 +mpi
     - py-bluepyefe@2.2.18
     - py-bluepymm@0.7.65