diff --git a/nova/values.yaml b/nova/values.yaml
index 14be434b69..b81ecad10c 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -86,7 +86,7 @@ images:
     nova_spiceproxy_assets: quay.io/airshipit/nova:2025.1-ubuntu_noble
     test: docker.io/xrally/xrally-openstack:2.0.0
     image_repo_sync: docker.io/docker:17.07.0
-    nova_wait_for_computes_init: gcr.io/google_containers/hyperkube-amd64:v1.11.6
+    nova_wait_for_computes_init: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
   local_registry:
     active: false
     exclude:
diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml
index ab608b90f5..1d20910009 100644
--- a/roles/deploy-env/defaults/main.yaml
+++ b/roles/deploy-env/defaults/main.yaml
@@ -54,6 +54,10 @@ loopback_setup: false
 loopback_device: /dev/loop100
 loopback_image: /var/lib/openstack-helm/ceph-loop.img
 loopback_image_size: 12G
+loopback_format: false
+loopback_format_fs_type: ext4
+loopback_mount: false
+loopback_mount_path: /srv/node/loop100
 
 coredns_resolver_setup: false
 coredns_dns_server: "8.8.8.8"
diff --git a/roles/deploy-env/handlers/main.yaml b/roles/deploy-env/handlers/main.yaml
index 60d2ef542c..dcd519ce9b 100644
--- a/roles/deploy-env/handlers/main.yaml
+++ b/roles/deploy-env/handlers/main.yaml
@@ -17,5 +17,5 @@
 - name: Restart loop-setup
   service:
     name: loop-setup
-    state: restarted
+    state: started
 ...
diff --git a/roles/deploy-env/tasks/loopback_devices_mount.yaml b/roles/deploy-env/tasks/loopback_devices_mount.yaml
new file mode 100644
index 0000000000..9f14e1880b
--- /dev/null
+++ b/roles/deploy-env/tasks/loopback_devices_mount.yaml
@@ -0,0 +1,27 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+- name: Format loop device
+  filesystem:
+    fstype: "{{ loopback_format_fs_type }}"
+    dev: "{{ loopback_device }}"
+  when: loopback_format
+
+- name: Mount loop device
+  mount:
+    src: "{{ loopback_device }}"
+    path: "{{ loopback_mount_path }}"
+    fstype: "{{ loopback_format_fs_type }}"
+    state: mounted
+  when: loopback_mount
+...
diff --git a/roles/deploy-env/tasks/main.yaml b/roles/deploy-env/tasks/main.yaml
index 90d6ed9f5e..61c0e9b703 100644
--- a/roles/deploy-env/tasks/main.yaml
+++ b/roles/deploy-env/tasks/main.yaml
@@ -30,6 +30,11 @@
     file: loopback_devices.yaml
   when: loopback_setup and inventory_hostname in (groups['k8s_cluster'] | default([]))
 
+- name: Loop device mount
+  include_tasks:
+    file: loopback_devices_mount.yaml
+  when: loopback_setup and inventory_hostname in (groups['k8s_cluster'] | default([]))
+
 - name: Deploy Containerd
   include_tasks:
     file: containerd.yaml