diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 64afd96..95451bf 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -44,6 +44,7 @@
 
 #include <globals.h>
 #include <installd_deps.h>
+#include <otapreopt_utils.h>
 #include <utils.h>
 
 #ifndef LOG_TAG
@@ -2124,10 +2125,7 @@
         }
         slot_suffix = buf;
 
-        // Validate.
-        std::regex slot_suffix_regex("[a-zA-Z0-9_]+");
-        std::smatch slot_suffix_match;
-        if (!std::regex_match(slot_suffix, slot_suffix_match, slot_suffix_regex)) {
+        if (!ValidateTargetSlotSuffix(slot_suffix)) {
             LOG(ERROR) << "Target slot suffix not legal: " << slot_suffix;
             return -1;
         }