diff --git a/sushy_oem_idrac/constants.py b/sushy_oem_idrac/constants.py
index 6723d02..4716ae1 100644
--- a/sushy_oem_idrac/constants.py
+++ b/sushy_oem_idrac/constants.py
@@ -10,5 +10,5 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-IDRAC_CONFIG_PENDING = 'IDRAC.1.6.LC068'
-IDRAC_JOB_RUNNING = 'IDRAC.1.6.RAC0679'
+IDRAC_CONFIG_PENDING = 'LC068'
+IDRAC_JOB_RUNNING = 'RAC0679'
diff --git a/sushy_oem_idrac/resources/manager/manager.py b/sushy_oem_idrac/resources/manager/manager.py
index 96e0af2..93e5986 100644
--- a/sushy_oem_idrac/resources/manager/manager.py
+++ b/sushy_oem_idrac/resources/manager/manager.py
@@ -147,7 +147,7 @@ VFDD\
                     LOG.warning('iDRAC error: %s',
                                 error.get('Message', 'Unknown error'))
 
-                    if message_id == constants.IDRAC_CONFIG_PENDING:
+                    if constants.IDRAC_CONFIG_PENDING in message_id:
                         if not rebooted:
                             LOG.warning(
                                 'Let\'s try to turn it off and on again... '
@@ -157,7 +157,7 @@ VFDD\
                             rebooted = True
                             break
 
-                    elif message_id == constants.IDRAC_JOB_RUNNING:
+                    elif constants.IDRAC_JOB_RUNNING in message_id:
                         pass
 
                 else: