diff --git a/scripts/devtest_overcloud.sh b/scripts/devtest_overcloud.sh
index 433e9119..5d25d216 100755
--- a/scripts/devtest_overcloud.sh
+++ b/scripts/devtest_overcloud.sh
@@ -480,7 +480,7 @@ if [ "stack-create" = "$HEAT_OP" ]; then #nodocs
 ## #. Register the end user image with glance.
 ##    ::
 
-    glance image-create --name user --public --disk-format qcow2 \
+    glance image-create --name user --is-public True --disk-format qcow2 \
         --container-format bare --file $TRIPLEO_ROOT/$USER_IMG_NAME
 
 fi #nodocs
diff --git a/scripts/load-image b/scripts/load-image
index d269cde1..3796c434 100755
--- a/scripts/load-image
+++ b/scripts/load-image
@@ -94,19 +94,19 @@ function load_image() {
     fi
 
     kernel_id=$(glance image-create --name "${GLANCE_IMAGE_NAME}-vmlinuz" \
-                                    --public \
+                                    --is-public True \
                                     --disk-format aki \
                                     --file "$KERNEL" \
                                     | grep ' id ' | awk '{print $4}')
     ramdisk_id=$(glance image-create --name "${GLANCE_IMAGE_NAME}-initrd" \
-                                     --public \
+                                     --is-public True \
                                      --disk-format ari \
                                      --file "$RAMDISK" \
                                      | grep ' id ' | awk '{print $4}')
 
     # >&3 sends to the original stdout as this is what we are after
     glance image-create --name $GLANCE_IMAGE_NAME \
-                        --public \
+                        --is-public True \
                         --disk-format qcow2 \
                         --container-format bare \
                         --property kernel_id=$kernel_id \
diff --git a/scripts/setup-baremetal b/scripts/setup-baremetal
index 431839db..aebd011a 100755
--- a/scripts/setup-baremetal
+++ b/scripts/setup-baremetal
@@ -77,9 +77,9 @@ fi
 
 deploy_kernel=$TRIPLEO_ROOT/$deploy_base.kernel
 deploy_ramdisk=$TRIPLEO_ROOT/$deploy_base.initramfs
-deploy_kernel_id=$(glance image-create --name bm-deploy-kernel --public \
+deploy_kernel_id=$(glance image-create --name bm-deploy-kernel --is-public True \
     --disk-format aki < "$deploy_kernel" | awk ' / id / {print $4}')
-deploy_ramdisk_id=$(glance image-create --name bm-deploy-ramdisk --public \
+deploy_ramdisk_id=$(glance image-create --name bm-deploy-ramdisk --is-public True \
     --disk-format ari < "$deploy_ramdisk" | awk ' / id / {print $4}')
 
 function cleanup_flavor () {