diff --git a/ods_ci/tasks/Resources/Provisioning/Hive/OSP/create_fips.sh b/ods_ci/tasks/Resources/Provisioning/Hive/OSP/create_fips.sh
index bbc843f72..d10bb9b19 100755
--- a/ods_ci/tasks/Resources/Provisioning/Hive/OSP/create_fips.sh
+++ b/ods_ci/tasks/Resources/Provisioning/Hive/OSP/create_fips.sh
@@ -40,6 +40,13 @@ osp_dashboard="$(openstack catalog show keystone -c endpoints -c name -c type \
 
 echo "Connected to Openstack: ${osp_dashboard}"
 
+echo "Cleaning unused Floating IPs in Openstack Cloud '$OSP_CLOUD' (before creating new IPs in Network '$OSP_NETWORK')"
+openstack floating ip list --status DOWN -c 'Floating IP Address' -f value | xargs -n1 -r --verbose openstack floating ip delete || rc=$?
+if [[ -n "$rc" ]] ; then
+  echo -e "Failure [$rc] cleaning unused floating IPs"
+  exit ${rc:+$rc}
+fi
+
 echo "Allocating a floating IP for cluster's API"
 cmd=(openstack floating ip create --description "$CLUSTER_NAME API" -f value -c floating_ip_address "$OSP_NETWORK")
 echo "${cmd[@]}"
diff --git a/ods_ci/tasks/Resources/Provisioning/Hive/OSP/hive_osp_cluster_template.yaml b/ods_ci/tasks/Resources/Provisioning/Hive/OSP/hive_osp_cluster_template.yaml
index 9163641ef..ecd50f1e4 100644
--- a/ods_ci/tasks/Resources/Provisioning/Hive/OSP/hive_osp_cluster_template.yaml
+++ b/ods_ci/tasks/Resources/Provisioning/Hive/OSP/hive_osp_cluster_template.yaml
@@ -97,7 +97,7 @@ items:
 - apiVersion: hive.openshift.io/v1
   kind: ClusterImageSet
   metadata:
-    name: rhods-imageset-ocp-${infrastructure_configurations}[ocp_version]
+    name: ${infrastructure_configurations}[image_set]
     namespace: ${infrastructure_configurations}[hive_claim_ns]
   spec:
     releaseImage: quay.io/openshift-release-dev/ocp-release:${infrastructure_configurations}[ocp_version]-x86_64
\ No newline at end of file