diff --git a/license/server/DatabaseHandler.h b/license/server/DatabaseHandler.h
index 8f1e55f..a2ceda4 100644
--- a/license/server/DatabaseHandler.h
+++ b/license/server/DatabaseHandler.h
@@ -5,8 +5,8 @@
 #include <LicenseRequest.pb.h>
 
 namespace license::server::database {
-    typedef size_t license_key_id_t;
-    typedef size_t upgrade_id_t;
+    typedef uint64_t license_key_id_t;
+    typedef uint64_t upgrade_id_t;
 
     class DatabaseHandler;
     class KeyIdCache {
diff --git a/license/shared/include/license/license.h b/license/shared/include/license/license.h
index bdf8056..c29fa4a 100644
--- a/license/shared/include/license/license.h
+++ b/license/shared/include/license/license.h
@@ -346,7 +346,7 @@ namespace license {
 	    std::chrono::system_clock::time_point creation;
 
 	    bool deleted{false};
-	    uint32_t upgrade_id{0};
+	    uint64_t upgrade_id{0};
 
         inline bool isNotExpired() { return (end.time_since_epoch().count() == 0 || std::chrono::system_clock::now() < this->end); }
     };