diff --git a/apps/server/src/common/helpers/nanoid.utils.ts b/apps/server/src/common/helpers/nanoid.utils.ts
index 712346590..f969faf64 100644
--- a/apps/server/src/common/helpers/nanoid.utils.ts
+++ b/apps/server/src/common/helpers/nanoid.utils.ts
@@ -5,4 +5,9 @@ export const nanoIdGen = customAlphabet(alphabet, 10);
 
 const slugIdAlphabet =
   '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-export const generateSlugId = customAlphabet(slugIdAlphabet, 10);
\ No newline at end of file
+export const generateSlugId = customAlphabet(slugIdAlphabet, 10);
+
+const baseIdSuffix = customAlphabet(alphabet, 9);
+
+export const generateBasePropertyId = (): string => `prp${baseIdSuffix()}`;
+export const generateBaseChoiceId = (): string => `opt${baseIdSuffix()}`;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 3587fa638..52a53ac53 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 3587fa638bf104f6b24ce5922c195613c618094a
+Subproject commit 52a53ac537a90aa95e38835696610d994b52c60a