diff --git a/.github/workflows/configs/integration.yml b/.github/workflows/configs/integration.yml
index ec100969c..6a10988e5 100644
--- a/.github/workflows/configs/integration.yml
+++ b/.github/workflows/configs/integration.yml
@@ -46,13 +46,6 @@ groups:
   - name: users
     gid: 5000
 images:
-  - name: azhop-centos78-v2-rdma
-    publisher: azhop
-    offer: CentOS
-    sku: 7.8-gen2
-    hyper_v: V2
-    os_type: Linux
-    version: 7.8 
   - name: azhop-centos79-v2-rdma-gpgpu
     publisher: azhop
     offer: CentOS
@@ -71,24 +64,24 @@ queues:
   - name: execute
     vm_size: Standard_F2s_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7_8:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
     spot: true
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1056
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1440
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 2880
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v3
     vm_size: Standard_HB120rs_v3
     max_core_count: 2880
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: viz3d
     vm_size: Standard_NV6
     max_core_count: 24
diff --git a/.github/workflows/configs/production.yml b/.github/workflows/configs/production.yml
index d3a32d28e..d49f43c45 100644
--- a/.github/workflows/configs/production.yml
+++ b/.github/workflows/configs/production.yml
@@ -46,13 +46,13 @@ groups:
   - name: users
     gid: 5000
 images:
-  - name: azhop-centos78-v2-rdma
+  - name: azhop-centos79-v2-rdma-gpgpu
     publisher: azhop
     offer: CentOS
-    sku: 7.8-gen2
+    sku: 7.9-gen2
     hyper_v: V2
     os_type: Linux
-    version: 7.8 
+    version: 7.9 
   - name: centos-7.8-desktop-3d
     publisher: azhop
     offer: CentOS
@@ -64,23 +64,23 @@ queues:
   - name: execute
     vm_size: Standard_F2s_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7_8:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1408
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1920
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 3840
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v3
     vm_size: Standard_HB120rs_v3
     max_core_count: 3840
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: viz3d
     vm_size: Standard_NV6
     max_core_count: 48
diff --git a/.github/workflows/configs/shared.yml b/.github/workflows/configs/shared.yml
index 4e16bd26f..bbfaa0aa3 100644
--- a/.github/workflows/configs/shared.yml
+++ b/.github/workflows/configs/shared.yml
@@ -29,13 +29,13 @@ groups:
   - name: users
     gid: 5000
 images:
-  - name: azhop-centos78-v2-rdma
+  - name: azhop-centos79-v2-rdma-gpgpu
     publisher: azhop
     offer: CentOS
-    sku: 7.8-gen2
+    sku: 7.9-gen2
     hyper_v: V2
     os_type: Linux
-    version: 7.8 
+    version: 7.9 
   - name: centos-7.7-desktop-3d
     publisher: azhop
     offer: CentOS
@@ -47,19 +47,19 @@ queues:
   - name: execute
     vm_size: Standard_F2s_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7_8:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1056
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1440
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 2880
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: viz3d
     vm_size: Standard_NV6
     max_core_count: 24
diff --git a/.github/workflows/configs/validation.yml b/.github/workflows/configs/validation.yml
index d5c3c6330..eb517dbaa 100644
--- a/.github/workflows/configs/validation.yml
+++ b/.github/workflows/configs/validation.yml
@@ -46,13 +46,13 @@ groups:
   - name: users
     gid: 5000
 images:
-  - name: azhop-centos78-v2-rdma
+  - name: azhop-centos79-v2-rdma-gpgpu
     publisher: azhop
     offer: CentOS
-    sku: 7.8-gen2
+    sku: 7.9-gen2
     hyper_v: V2
     os_type: Linux
-    version: 7.8 
+    version: 7.9 
   - name: centos-7.8-desktop-3d
     publisher: azhop
     offer: CentOS
@@ -64,23 +64,23 @@ queues:
   - name: execute
     vm_size: Standard_F2s_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7_8:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1056
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1440
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 2880
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v3
     vm_size: Standard_HB120rs_v3
     max_core_count: 2880
-    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: viz3d
     vm_size: Standard_NV6
     max_core_count: 24
diff --git a/.github/workflows/deploy_full.yml b/.github/workflows/deploy_full.yml
index c76c684a3..c750538a7 100644
--- a/.github/workflows/deploy_full.yml
+++ b/.github/workflows/deploy_full.yml
@@ -117,7 +117,7 @@ jobs:
     needs: deploy
     strategy: 
       matrix:
-        packer_file: ["azhop-centos78-v2-rdma.json", "centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
+        packer_file: ["centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
     container:
       image: xpillons/hpcrover:latest
       options: --user 0
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b048d9f0c..2e776d5d6 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -236,7 +236,7 @@ jobs:
     needs: deploy
     strategy: 
       matrix:
-        packer_file: ["azhop-centos78-v2-rdma.json", "centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
+        packer_file: ["centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
     container:
       image: xpillons/hpcrover:latest
       options: --user 0
diff --git a/.github/workflows/update_image.yml b/.github/workflows/update_image.yml
index b37fa2bc2..3bf388c64 100644
--- a/.github/workflows/update_image.yml
+++ b/.github/workflows/update_image.yml
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy: 
       matrix:
-        packer_file: ["azhop-centos78-v2-rdma.json", "centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
+        packer_file: ["centos-7.8-desktop-3d.json", "azhop-centos79-v2-rdma-gpgpu.json"]
     container:
       image: xpillons/hpcrover:latest
       options: --user 0
diff --git a/config.tpl.yml b/config.tpl.yml
index 4b492fb9a..fb5abf5af 100644
--- a/config.tpl.yml
+++ b/config.tpl.yml
@@ -72,10 +72,10 @@ images:
   - name: image_definition_name # Should match the packer configuration file name, one per packer file
     publisher: azhop
     offer: CentOS
-    sku: 7.8-gen2
+    sku: 7_9-gen2
     hyper_v: V2 # V1 or V2 (V1 is the default)
     os_type: Linux # Linux or Windows
-    version: 7.8 # Version of the image to create the image definition in SIG
+    version: 7.9 # Version of the image to create the image definition in SIG
 queues:
   - name: execute # name of the Cycle Cloud node array
     # Azure VM Instance type
@@ -83,7 +83,7 @@ queues:
     # maximum number of cores that can be instanciated
     max_core_count: 1024
     # marketplace image name or custom image id
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
     # Set to true if AccelNet need to be enabled. false is the default value
     EnableAcceleratedNetworking: false
     # spot instance support. Default is false
@@ -91,16 +91,16 @@ queues:
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
-    #image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos78-v2-rdma/latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
+    #/subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: /subscriptions/{{subscription_id}}/resourceGroups/{{resource_group}}/providers/Microsoft.Compute/galleries/{{sig_name}}/images/azhop-centos79-v2-rdma-gpgpu/latest
   - name: viz3d
     vm_size: Standard_NV6
     max_core_count: 1024
diff --git a/playbooks/ood.yml b/playbooks/ood.yml
index 0b4fa4a97..e89d736f6 100644
--- a/playbooks/ood.yml
+++ b/playbooks/ood.yml
@@ -137,7 +137,7 @@
     yum_repository:
       name: lustreserver
       description: Lustre repo
-      baseurl: https://downloads.whamcloud.com/public/lustre/lustre-2.12.5/el7/patchless-ldiskfs-server/
+      baseurl: https://downloads.whamcloud.com/public/lustre/lustre-2.12.6/el7/patchless-ldiskfs-server/
       file: LustrePack
       enabled: yes
       gpgcheck: no
@@ -145,7 +145,7 @@
     yum_repository:
       name: lustreclient
       description: Lustre repo
-      baseurl: https://downloads.whamcloud.com/public/lustre/lustre-2.12.5/el7/client/
+      baseurl: https://downloads.whamcloud.com/public/lustre/lustre-2.12.6/el7/client/
       file: LustrePack
       enabled: yes
       gpgcheck: no
diff --git a/playbooks/roles/cyclecloud_pbs/defaults/all.yml b/playbooks/roles/cyclecloud_pbs/defaults/all.yml
index 95d6ce4a6..b08b9c8d8 100644
--- a/playbooks/roles/cyclecloud_pbs/defaults/all.yml
+++ b/playbooks/roles/cyclecloud_pbs/defaults/all.yml
@@ -8,16 +8,16 @@ cc_queues:
   - name: execute
     vm_size: Standard_F2s_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hc44rs
     vm_size: Standard_HC44rs
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hb60rs
     vm_size: Standard_HB60rs
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
   - name: hb120rs_v2
     vm_size: Standard_HB120rs_v2
     max_core_count: 1024
-    image: OpenLogic:CentOS-HPC:7.7:latest
+    image: OpenLogic:CentOS-HPC:7_9-gen2:latest
diff --git a/playbooks/roles/cyclecloud_pbs/templates/pbs-headless.json.j2 b/playbooks/roles/cyclecloud_pbs/templates/pbs-headless.json.j2
index 11f209474..d4c554f60 100644
--- a/playbooks/roles/cyclecloud_pbs/templates/pbs-headless.json.j2
+++ b/playbooks/roles/cyclecloud_pbs/templates/pbs-headless.json.j2
@@ -10,5 +10,5 @@
     }
   },
   "Credentials" : "azure",
-  "ImageName" : "OpenLogic:CentOS-HPC:7.7:latest"
+  "ImageName" : "OpenLogic:CentOS-HPC:7_9-gen2:latest"
 }
diff --git a/playbooks/roles/tests/files/test.sh b/playbooks/roles/tests/files/test.sh
index 0f4ed564a..f31763b57 100755
--- a/playbooks/roles/tests/files/test.sh
+++ b/playbooks/roles/tests/files/test.sh
@@ -18,6 +18,8 @@ function make_uuid_str {
 # Check homedir
 echo "Check if /anfhome is mounted"
 df | grep anfhome || exit 1
+echo "Check if /lustre is mounted"
+df | grep lustre || exit 1
 
 # Check PBS
 export PBS_MAX_WALLTIME="00:20:00"
diff --git a/tf/jumpbox.tf b/tf/jumpbox.tf
index 2f742e9f1..c75880f44 100644
--- a/tf/jumpbox.tf
+++ b/tf/jumpbox.tf
@@ -41,7 +41,7 @@ resource "azurerm_linux_virtual_machine" "jumpbox" {
   source_image_reference {
     publisher = "OpenLogic"
     offer     = "CentOS"
-    sku       = "7.7"
+    sku       = "7_9-gen2"
     version   = "latest"
   }
 }
diff --git a/tf/ondemand.tf b/tf/ondemand.tf
index d474c7223..0fe4b7f9a 100644
--- a/tf/ondemand.tf
+++ b/tf/ondemand.tf
@@ -42,7 +42,7 @@ resource "azurerm_linux_virtual_machine" "ondemand" {
   source_image_reference {
     publisher = "OpenLogic"
     offer     = "CentOS"
-    sku       = "7_8"
+    sku       = "7_9-gen2"
     version   = "latest"
   }
 }
diff --git a/tf/scheduler.tf b/tf/scheduler.tf
index 0ef0c0e4a..80deff28f 100644
--- a/tf/scheduler.tf
+++ b/tf/scheduler.tf
@@ -33,7 +33,7 @@ resource "azurerm_linux_virtual_machine" "scheduler" {
   source_image_reference {
     publisher = "OpenLogic"
     offer     = "CentOS"
-    sku       = "7.7"
+    sku       = "7_9-gen2"
     version   = "latest"
   }
 }