diff --git a/os-replace.sh b/os-replace.sh
index 53f88c4..9dddc57 100755
--- a/os-replace.sh
+++ b/os-replace.sh
@@ -19,7 +19,12 @@ INSTALL_CONTAINERFILE="$LAYERED_DIR/Containerfile"
 UPGRADE_CONTAINERFILE=${TEMPDIR}/Containerfile.upgrade
 QUAY_REPO_TAG="${QUAY_REPO_TAG:-$(tr -dc a-z0-9 < /dev/urandom | head -c 4 ; echo '')}"
 INVENTORY_FILE="${TEMPDIR}/inventory"
-AWS_BARE="${AWS_BARE-false}"
+AWS_BARE="${AWS_BARE-False}"
+
+# bare PLATFORM uses aws bare instance
+if [[ "$PLATFORM" == bare ]]; then
+    PLATFORM="aws"
+fi
 
 greenprint "Login quay.io"
 podman login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" quay.io
diff --git a/playbooks/deploy-aws.yaml b/playbooks/deploy-aws.yaml
index 8176f93..4741fc5 100644
--- a/playbooks/deploy-aws.yaml
+++ b/playbooks/deploy-aws.yaml
@@ -54,14 +54,14 @@
         random_instance_type: "c5n.metal"
         spot_max_price: "1.5"
       when:
-        - aws_bare | default('') == "true" and arch == "x86_64"
+        - aws_bare | default('') == "True" and arch == "x86_64"
 
     - name: set random instance type to a fixed value for aarch64 bare test
       set_fact:
         random_instance_type: "c6g.metal"
         spot_max_price: "1.0"
       when:
-        - aws_bare | default('') == "true" and arch == "aarch64"
+        - aws_bare | default('') == "True" and arch == "aarch64"
 
     - name: get virtqe subnet
       shell: |
diff --git a/tmt/plans/os-replace.fmf b/tmt/plans/os-replace.fmf
index 72526b7..77f4c72 100644
--- a/tmt/plans/os-replace.fmf
+++ b/tmt/plans/os-replace.fmf
@@ -123,7 +123,7 @@ execute:
   environment+:
     PLATFORM: aws
     LAYERED_IMAGE: cloud-init
-    AWS_BARE: true
+    AWS_BARE: True
   prepare+:
     - how: shell
       script: curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install