diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 17a02be608..3abfb4995b 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -122,14 +122,6 @@ enable_rabbitmq: "no"
 {% endif %}
 
 {% if scenario == "cephadm" %}
-{% if ansible_facts.distribution == "Rocky" %}
-docker_custom_config:
-  default-ulimits:
-    nofile:
-      Name: nofile
-      Hard: 1048576
-      Soft: 1048576
-{% endif %}
 # kolla-ansible vars
 enable_cinder: "yes"
 # External Ceph
diff --git a/tests/test-core-openstack.sh b/tests/test-core-openstack.sh
index 1dcd3b539c..cbe61666e4 100755
--- a/tests/test-core-openstack.sh
+++ b/tests/test-core-openstack.sh
@@ -210,16 +210,19 @@ function create_instance {
     attempts=10
     for i in $(seq 1 ${attempts}); do
         if openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}; then
-            # If the status is not ACTIVE, print info and exit 1
+            # If the status is not ACTIVE, print info, delete instance (for recreation) and exit 1
+            # if exceeded number of attempts
             if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
                 echo "FAILED: Instance is not active"
                 openstack --debug server show ${name}
                 openstack server delete ${name}
+                if [[ $i -eq ${attempts} ]]; then
+                    echo "Failed to create instance after ${attempts} attempts"
+                    exit 1
+                fi
             else
                 break
             fi
-        elif [[ $i -eq ${attempts} ]]; then
-            echo "Failed to create instance after ${attempts} attempts"
         else
             echo "Cannot create instance, retrying"
             openstack server delete ${name}