diff --git a/elements/overcloud-partition-uefi/element-deps b/elements/overcloud-partition-uefi/element-deps
deleted file mode 100644
index c6acfa2c3..000000000
--- a/elements/overcloud-partition-uefi/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-block-device-efi
diff --git a/elements/overcloud-partition-uefi/element-provides b/elements/overcloud-partition-uefi/element-provides
new file mode 100644
index 000000000..c0180a2cb
--- /dev/null
+++ b/elements/overcloud-partition-uefi/element-provides
@@ -0,0 +1 @@
+block-device
\ No newline at end of file
diff --git a/elements/overcloud-partition-uefi/environment.d/15-block-device.bash b/elements/overcloud-partition-uefi/environment.d/15-block-device.bash
new file mode 100644
index 000000000..419be58f5
--- /dev/null
+++ b/elements/overcloud-partition-uefi/environment.d/15-block-device.bash
@@ -0,0 +1,10 @@
+#
+# Arch gate
+#
+
+if [[ "ppc64 ppc64le ppc64el" =~ "$ARCH" ]]; then
+    echo "overcloud-partition-uefi is not supported on Power"
+    exit 1
+fi
+
+export DIB_BLOCK_DEVICE=efi
diff --git a/elements/overcloud-partition/element-deps b/elements/overcloud-partition/element-deps
deleted file mode 100644
index bdad48b6f..000000000
--- a/elements/overcloud-partition/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-block-device-mbr
diff --git a/elements/overcloud-partition/element-provides b/elements/overcloud-partition/element-provides
new file mode 100644
index 000000000..c0180a2cb
--- /dev/null
+++ b/elements/overcloud-partition/element-provides
@@ -0,0 +1 @@
+block-device
\ No newline at end of file
diff --git a/elements/overcloud-partition/environment.d/15-block-device.bash b/elements/overcloud-partition/environment.d/15-block-device.bash
new file mode 100644
index 000000000..cad214648
--- /dev/null
+++ b/elements/overcloud-partition/environment.d/15-block-device.bash
@@ -0,0 +1,10 @@
+#
+# Arch gate
+#
+
+if [[ "arm64 aarch64" =~ $ARCH ]]; then
+    echo "overcloud-partition is not supported on AARCH64"
+    exit 1
+fi
+
+export DIB_BLOCK_DEVICE=mbr