diff --git a/bindep.txt b/bindep.txt
index 2538b79c8f..bf32be829a 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -23,7 +23,7 @@ syslinux [platform:rpm platform:ubuntu-trusty platform:debian-wheezy default]
 syslinux-common [platform:ubuntu-xenial platform:debian-jessie default]
 socat [default]
 # Grub2 files for boot loadingusing PXE/GRUB2
-shim [platform:dpkg default]
+shim-signed [platform:dpkg default]
 grub-efi-amd64-signed [platform:dpkg default]
 
 # these are needed to create and access VMs when testing with virtual hardware
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 5b65ae8594..86a638b4d9 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -612,7 +612,7 @@ UEFI_NVRAM_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_VARS.fd
 if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then
     install_package shim
     if is_ubuntu; then
-        install_package grub-efi-amd64-signed
+        install_package grub-efi-amd64-signed shim-signed
     elif is_fedora; then
         install_package grub2-efi
     fi
@@ -637,7 +637,11 @@ if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
     fi
 
     if is_ubuntu && [[ -z $IRONIC_GRUB2_FILE ]]; then
-        IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi
+        if [[ -f /usr/lib/shim/shimx64.efi.signed ]]; then
+            IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi.signed
+        else
+            IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi
+        fi
         IRONIC_GRUB2_FILE=/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed
     fi
 
diff --git a/doc/source/install/configure-pxe.rst b/doc/source/install/configure-pxe.rst
index 7a105a3df2..4549640058 100644
--- a/doc/source/install/configure-pxe.rst
+++ b/doc/source/install/configure-pxe.rst
@@ -123,7 +123,7 @@ the PXE UEFI environment.
 
 #. Install Grub2 and shim packages:
 
-   Ubuntu (16.04LTS and later)::
+   Ubuntu (18.04LTS and later)::
 
        sudo apt-get install grub-efi-amd64-signed shim-signed
 
@@ -137,9 +137,9 @@ the PXE UEFI environment.
 
 #. Copy grub and shim boot loader images to ``/tftpboot`` directory:
 
-   Ubuntu (16.04LTS and later)::
+   Ubuntu (18.04LTS and later)::
 
-       sudo cp /usr/lib/shim/shim.efi.signed /tftpboot/bootx64.efi
+       sudo cp /usr/lib/shim/shimx64.efi.signed /tftpboot/bootx64.efi
        sudo cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed /tftpboot/grubx64.efi
 
    Fedora::