diff --git a/continuousintegration/orchestration/presets/dev-eos-grpc-values.yaml b/continuousintegration/orchestration/presets/dev-eos-grpc-values.yaml
index c2aba7182ae7d9f6d61ebcbd418bcd3d7ec23f67..a83120ca15ef8a2ab2fb941d25aacc087d191123 100644
--- a/continuousintegration/orchestration/presets/dev-eos-grpc-values.yaml
+++ b/continuousintegration/orchestration/presets/dev-eos-grpc-values.yaml
@@ -23,7 +23,7 @@ global:
         name: {{ include "mgm.instancename" . }}
       spec:
         type: ExternalName
-        externalName: {{ include "utils.mgm_fqdn" . }}
+        externalName: {{ include "utils.mgm_address" . }}
 
 
 mgm:
@@ -185,7 +185,7 @@ fst:
 
   xrd:
     extraConfig: |
-      xrootd.redirect {{ include "utils.mgm_fqdn" . }}:1094 chksum
+      xrootd.redirect {{ include "utils.mgm_address" . }}:1094 chksum
       fstofs.protowfendpoint cta-frontend-grpc:10956
       fstofs.protowfresource /ctafrontend
       fstofs.filemd_handler  attr
diff --git a/continuousintegration/orchestration/presets/dev-eos-xrd-values.yaml b/continuousintegration/orchestration/presets/dev-eos-xrd-values.yaml
index 73339fdce0760cbe658911434b7b95c01c8ed14c..e99a0d8f61d668a3cda1db4e71d6d76fb17c21aa 100644
--- a/continuousintegration/orchestration/presets/dev-eos-xrd-values.yaml
+++ b/continuousintegration/orchestration/presets/dev-eos-xrd-values.yaml
@@ -23,7 +23,7 @@ global:
         name: {{ include "mgm.instancename" . }}
       spec:
         type: ExternalName
-        externalName: {{ include "utils.mgm_fqdn" . }}
+        externalName: {{ include "utils.mgm_address" . }}
 
 
 mgm:
@@ -108,7 +108,7 @@ fst:
 
   xrd:
     extraConfig: |
-      xrootd.redirect {{ include "utils.mgm_fqdn" . }}:1094 chksum
+      xrootd.redirect {{ include "utils.mgm_address" . }}:1094 chksum
       fstofs.protowfendpoint cta-frontend:10955
       fstofs.protowfresource /ctafrontend
       fstofs.protowfusegrpc false
diff --git a/continuousintegration/orchestration/presets/stress-eos-grpc-values.yaml b/continuousintegration/orchestration/presets/stress-eos-grpc-values.yaml
index 87a53b7a367713c8fa06721d15088326b8dddcdd..49d0a13f73e99ae2b1a099c19bddaaa67ec0db3f 100644
--- a/continuousintegration/orchestration/presets/stress-eos-grpc-values.yaml
+++ b/continuousintegration/orchestration/presets/stress-eos-grpc-values.yaml
@@ -23,7 +23,7 @@ global:
         name: {{ include "mgm.instancename" . }}
       spec:
         type: ExternalName
-        externalName: {{ include "utils.mgm_fqdn" . }}
+        externalName: {{ include "utils.mgm_address" . }}
 
 
 mgm:
@@ -182,10 +182,6 @@ fst:
   persistence:
     enabled: true
     storageClass: "fast-ssd"
-    # This is a temporary work-around until the bug is fixed in the EOS charts
-    # https://gitlab.cern.ch/eos/eos-charts/-/issues/113
-    pvc:
-      storageClass: "fast-ssd"
     annotations: {}
     accessModes:
       - ReadWriteOnce
@@ -197,7 +193,7 @@ fst:
 
   xrd:
     extraConfig: |
-      xrootd.redirect {{ include "utils.mgm_fqdn" . }}:1094 chksum
+      xrootd.redirect {{ include "utils.mgm_address" . }}:1094 chksum
       fstofs.protowfendpoint cta-frontend-grpc:10956
       fstofs.protowfresource /ctafrontend
       fstofs.filemd_handler  attr
@@ -317,9 +313,6 @@ qdb:
   persistence:
     enabled: true
     storageClass: "fast-ssd"
-    # This is a temporary work-around until the bug is fixed in the EOS charts
-    pvc:
-      storageClass: "fast-ssd"
     annotations: {}
     accessModes:
       - ReadWriteOnce
diff --git a/continuousintegration/orchestration/presets/stress-eos-xrd-values.yaml b/continuousintegration/orchestration/presets/stress-eos-xrd-values.yaml
index c8e268e816f0c34d2971b075621a0e53fd5eb9cd..abe2f98f47685b136be54e8019f2e6a7b62d4c17 100644
--- a/continuousintegration/orchestration/presets/stress-eos-xrd-values.yaml
+++ b/continuousintegration/orchestration/presets/stress-eos-xrd-values.yaml
@@ -23,7 +23,7 @@ global:
         name: {{ include "mgm.instancename" . }}
       spec:
         type: ExternalName
-        externalName: {{ include "utils.mgm_fqdn" . }}
+        externalName: {{ include "utils.mgm_address" . }}
 
 
 mgm:
@@ -105,10 +105,6 @@ fst:
   persistence:
     enabled: true
     storageClass: "fast-ssd"
-    # This is a temporary work-around until the bug is fixed in the EOS charts
-    # https://gitlab.cern.ch/eos/eos-charts/-/issues/113
-    pvc:
-      storageClass: "fast-ssd"
     annotations: {}
     accessModes:
       - ReadWriteOnce
@@ -120,7 +116,7 @@ fst:
 
   xrd:
     extraConfig: |
-      xrootd.redirect {{ include "utils.mgm_fqdn" . }}:1094 chksum
+      xrootd.redirect {{ include "utils.mgm_address" . }}:1094 chksum
       fstofs.protowfendpoint cta-frontend:10955
       fstofs.protowfresource /ctafrontend
       fstofs.protowfusegrpc false
@@ -163,9 +159,6 @@ qdb:
   persistence:
     enabled: true
     storageClass: "fast-ssd"
-    # This is a temporary work-around until the bug is fixed in the EOS charts
-    pvc:
-      storageClass: "fast-ssd"
     annotations: {}
     accessModes:
       - ReadWriteOnce
diff --git a/project.json b/project.json
index 460659ffbd91d0b9c35c8bc4e9d19f1e76b4f437..5b3510390aac3a48f2aca12babf339d3b647b1d8 100644
--- a/project.json
+++ b/project.json
@@ -15,7 +15,7 @@
     "ctaImageRepository": "gitlab-registry.cern.ch/cta/ctageneric",
     "eosImageRepository": "gitlab-registry.cern.ch/dss/eos/eos-ci",
     "eosImageTag": "5.3.23.el9",
-    "eosServerChartVersion": "0.5.1",
+    "eosServerChartVersion": "0.9.8",
     "dCacheChartVersion": "0.1.0",
     "dCacheImageTag": "94471db7"
   },