diff --git a/src/lib/services/state-schema.ts b/src/lib/services/state-schema.ts
index 51bdeae7bb..15a03372c7 100644
--- a/src/lib/services/state-schema.ts
+++ b/src/lib/services/state-schema.ts
@@ -26,7 +26,7 @@ export const featureEnvironmentsSchema = joi.object().keys({
 });
 
 export const environmentSchema = joi.object().keys({
-    name: nameType,
+    name: nameType.allow(':global:'),
     displayName: joi.string().optional().allow(''),
 });
 
diff --git a/src/lib/services/tag-type-schema.ts b/src/lib/services/tag-type-schema.ts
index 1fecdd4b63..8770390cb2 100644
--- a/src/lib/services/tag-type-schema.ts
+++ b/src/lib/services/tag-type-schema.ts
@@ -5,7 +5,7 @@ export const tagTypeSchema = Joi.object()
     .keys({
         name: customJoi.isUrlFriendly().min(2).max(50).required(),
         description: Joi.string().allow(''),
-        icon: Joi.string().allow(''),
+        icon: Joi.string().allow(null).allow(''),
     })
     .options({
         allowUnknown: false,