diff --git a/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh b/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh
index 62123a9e..ae9e57f8 100755
--- a/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh
+++ b/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh
@@ -66,7 +66,7 @@ METADATA_PATH="/tmp/metadata.txt"
 
 sudo rm -rf "${IPA_BUILD_WORKSPACE}"
 # Update apt packages
-sudo apt-get update -y 
+sudo apt-get update -y
 
 # Install required packages
 sudo apt-get install --yes python3-pip python3-virtualenv qemu-utils
diff --git a/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/cleanup.d/99-ipa-cleanup-dracut b/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/cleanup.d/99-ipa-cleanup-dracut
index 8e65885c..ad770089 100755
--- a/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/cleanup.d/99-ipa-cleanup-dracut
+++ b/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/cleanup.d/99-ipa-cleanup-dracut
@@ -1,9 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [ "${DIB_DEBUG_TRACE:-1}" -gt 0 ]; then
+if [[ "${DIB_DEBUG_TRACE:-1}" -gt 0 ]]; then
     set -x
 fi
 set -eu
-set -o pipefail
 
 sudo rm -rf "$TARGET_ROOT/var/tmp/dracut"*
diff --git a/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/finalise.d/99-delete-dracut b/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/finalise.d/99-delete-dracut
new file mode 100755
index 00000000..4333d107
--- /dev/null
+++ b/jenkins/scripts/dynamic_worker_workflow/ipa_builder_elements/ipa-cleanup-dracut/finalise.d/99-delete-dracut
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "${DIB_DEBUG_TRACE:-1}" -gt 0 ]; then
+    set -x
+fi
+set -eu
+set -o pipefail
+
+sudo dnf remove -y dracut