diff --git a/certs_manager.cpp b/certs_manager.cpp
index 59808c1..a03088d 100644
--- a/certs_manager.cpp
+++ b/certs_manager.cpp
@@ -263,7 +263,14 @@
     {
         for (auto& usage : keyUsage)
         {
-            addEntry(x509Name, "keyUsage", usage);
+            if (isExtendedKeyUsage(usage))
+            {
+                addEntry(x509Name, "extendedKeyUsage", usage);
+            }
+            else
+            {
+                addEntry(x509Name, "keyUsage", usage);
+            }
         }
     }
     addEntry(x509Name, "O", organization);
@@ -313,6 +320,16 @@
     writeCSR(csrFilePath.string(), x509Req);
 }
 
+bool Manager::isExtendedKeyUsage(const std::string& usage)
+{
+    const static std::array<const char*, 6> usageList = {
+        "ServerAuthentication", "ClientAuthentication", "OCSPSigning",
+        "Timestamping",         "CodeSigning",          "EmailProtection"};
+    auto it = std::find_if(
+        usageList.begin(), usageList.end(),
+        [&usage](const char* s) { return (strcmp(s, usage.c_str()) == 0); });
+    return it != usageList.end();
+}
 EVP_PKEY_Ptr Manager::generateRSAKeyPair(const int64_t keyBitLength)
 {
     int ret = 0;
diff --git a/certs_manager.hpp b/certs_manager.hpp
index 355840d..da47d35 100644
--- a/certs_manager.hpp
+++ b/certs_manager.hpp
@@ -198,6 +198,12 @@
     void addEntry(X509_NAME* x509Name, const char* field,
                   const std::string& bytes);
 
+    /** @brief Check if usage is extended key usage
+     *  @param[in] usage - key usage value
+     *  @return true if part of extended key usage
+     */
+    bool isExtendedKeyUsage(const std::string& usage);
+
     /** @brief Create CSR D-Bus object by reading the data in the CSR file
      *  @param[in] statis - SUCCESSS/FAILURE In CSR generation.
      */