diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index c5adfefad9..53e5e43b0a 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.4.23
+version: 0.4.24
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml
index d8aee23789..f2890df425 100644
--- a/glance/templates/job-storage-init.yaml
+++ b/glance/templates/job-storage-init.yaml
@@ -164,10 +164,6 @@ spec:
               readOnly: true
             {{ end }}
             {{ end }}
-            {{- if eq .Values.storage "pvc" }}
-            - name: glance-images
-              mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
-            {{ end }}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
       volumes:
         - name: pod-tmp
@@ -189,10 +185,5 @@ spec:
             secretName: {{ .Values.ceph_client.user_secret_name }}
         {{ end }}
         {{ end }}
-        {{- if eq .Values.storage "pvc" }}
-        - name: glance-images
-          persistentVolumeClaim:
-            claimName: glance-images
-        {{ end }}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{- end }}
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index 3456e15c7d..9bdd7e33b4 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -57,4 +57,5 @@ glance:
   - 0.4.21 Use uWSGI
   - 0.4.22 Enable custom annotations for Openstack secrets
   - 0.4.23 Update images used by default
+  - 0.4.24 Do not attach backend pvc to storage init pod
 ...
diff --git a/tools/deployment/component/common/mariadb.sh b/tools/deployment/component/common/mariadb.sh
index b33ff9d4f7..db4c35ab3b 100755
--- a/tools/deployment/component/common/mariadb.sh
+++ b/tools/deployment/component/common/mariadb.sh
@@ -22,9 +22,8 @@ set -xe
 #NOTE: Deploy command
 helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
     --namespace=openstack \
-    --set volume.use_local_path_for_single_pod_cluster.enabled=true \
-    --set volume.enabled=false \
     --set pod.replicas.server=1 \
+    ${VOLUME_HELM_ARGS:="--set volume.use_local_path_for_single_pod_cluster.enabled=true --set volume.enabled=false"} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
 
diff --git a/tools/deployment/component/common/openstack.sh b/tools/deployment/component/common/openstack.sh
index b5138d9691..a617f666b9 100755
--- a/tools/deployment/component/common/openstack.sh
+++ b/tools/deployment/component/common/openstack.sh
@@ -30,7 +30,7 @@ tee /tmp/glance.yaml <<EOF
 glance:
   storage: ${GLANCE_BACKEND}
   volume:
-    class_name: standard
+    class_name: general
 EOF
 #NOTE: Deploy neutron
 tee /tmp/neutron.yaml << EOF
diff --git a/tools/deployment/component/common/rabbitmq.sh b/tools/deployment/component/common/rabbitmq.sh
index 7844302d0d..4c5a044810 100755
--- a/tools/deployment/component/common/rabbitmq.sh
+++ b/tools/deployment/component/common/rabbitmq.sh
@@ -22,9 +22,9 @@ set -xe
 #NOTE: Deploy command
 helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
     --namespace=openstack \
-    --set volume.enabled=false \
     --set pod.replicas.server=1 \
     --timeout=600s \
+    ${VOLUME_HELM_ARGS:="--set volume.enabled=false"} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
 
diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh
index 2adc848d65..0b4c80215a 100755
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@@ -25,7 +25,7 @@ set -xe
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 volume:
-  class_name: standard
+  class_name: general
 bootstrap:
   structured:
     images:
diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml
index 6edcd6ca2e..3b939ac36f 100644
--- a/zuul.d/2024.1.yaml
+++ b/zuul.d/2024.1.yaml
@@ -53,6 +53,16 @@
         container_distro_name: ubuntu
         container_distro_version: jammy
 
+- job:
+    name: openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy
+    parent: openstack-helm-compute-kit-rook
+    nodeset: openstack-helm-5nodes-ubuntu_jammy
+    vars:
+      osh_params:
+        openstack_release: "2024.1"
+        container_distro_name: ubuntu
+        container_distro_version: jammy
+
 - job:
     name: openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index da57c085f9..9b63c1fb98 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -95,6 +95,31 @@
         - ./tools/deployment/common/use-it.sh
         - ./tools/deployment/common/force-cronjob-run.sh
 
+- job:
+    name: openstack-helm-compute-kit-rook
+    parent: openstack-helm-deploy
+    abstract: true
+    vars:
+      gate_scripts:
+        - ./tools/deployment/common/prepare-k8s.sh
+        - ./tools/deployment/common/prepare-charts.sh
+        - ./tools/deployment/common/setup-client.sh
+        - ./tools/deployment/component/ceph/ceph-rook.sh
+        - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
+        - ./tools/deployment/common/ingress.sh
+        - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/rabbitmq.sh
+        - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/component/common/memcached.sh
+        - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/cinder/cinder.sh
+        - ./tools/deployment/component/heat/heat.sh
+        - ./tools/deployment/component/glance/glance.sh
+        - ./tools/deployment/component/compute-kit/openvswitch.sh
+        - ./tools/deployment/component/compute-kit/libvirt.sh
+        - ./tools/deployment/component/compute-kit/compute-kit.sh
+        - ./tools/deployment/common/use-it.sh
+        - ./tools/deployment/common/force-cronjob-run.sh
+
 - job:
     name: openstack-helm-compute-kit-helm-repo-local
     parent: openstack-helm-deploy
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 330bf218fa..2055217deb 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -164,3 +164,43 @@
       - name: k8s_control_plane
         nodes:
           - primary
+
+- nodeset:
+    name: openstack-helm-5nodes-ubuntu_jammy
+    nodes:
+      - name: primary
+        label: ubuntu-jammy
+      - name: node-1
+        label: ubuntu-jammy
+      - name: node-2
+        label: ubuntu-jammy
+      - name: node-3
+        label: ubuntu-jammy
+      - name: node-4
+        label: ubuntu-jammy
+    groups:
+      - name: primary
+        nodes:
+          - primary
+      - name: nodes
+        nodes:
+          - node-1
+          - node-2
+          - node-3
+          - node-4
+      - name: k8s_cluster
+        nodes:
+          - primary
+          - node-1
+          - node-2
+          - node-3
+          - node-4
+      - name: k8s_control_plane
+        nodes:
+          - primary
+      - name: k8s_nodes
+        nodes:
+          - node-1
+          - node-2
+          - node-3
+          - node-4
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 74af02edd0..c0616ac11f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -66,3 +66,4 @@
     periodic:
       jobs:
         - openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy  # 1 node + 2 nodes
+        - openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy  # 5 nodes / rook