diff --git a/openapi/components/parameters.yaml b/openapi/components/parameters.yaml
index aa5e5242..029c44a3 100644
--- a/openapi/components/parameters.yaml
+++ b/openapi/components/parameters.yaml
@@ -249,35 +249,35 @@ platform:
   in: query
   required: false
   schema:
-    type: string
+    $ref: ./schemas/Platform.yaml
   description: The platform the asset supports.
 tag:
   name: tag
   in: query
   required: false
   schema:
-    type: string
+    $ref: ./schemas/Tag.yaml
   description: Tags to include (comma-separated). Any of the tags needs to be present.
 include:
   name: include
   in: query
   required: false
   schema:
-    type: string
+    $ref: ./schemas/Tag.yaml
   description: Tags to include (comma-separated). Any of the tags needs to be present.
 require:
   name: require
   in: query
   required: false
   schema:
-    type: string
+    $ref: ./schemas/Tag.yaml
   description: Tags to include (comma-separated). All of the tags needs to be present.
 notag:
   name: notag
   in: query
   required: false
   schema:
-    type: string
+    $ref: ./schemas/Tag.yaml
   description: Tags to exclude (comma-separated).
 search:
   name: search
diff --git a/openapi/components/paths/files.yaml b/openapi/components/paths/files.yaml
index 32e135f3..02ec6d56 100644
--- a/openapi/components/paths/files.yaml
+++ b/openapi/components/paths/files.yaml
@@ -288,7 +288,7 @@ paths:
                   format: binary
                   description: The binary blob of the png file.
                 tag:
-                  type: string
+                  $ref: ../parameters.yaml#/tag
                   description: Needs to be either icon, gallery, sticker, emoji, or emojianimated
                 frames:
                   type: integer
diff --git a/openapi/components/schemas/CurrentUser.yaml b/openapi/components/schemas/CurrentUser.yaml
index fd9493c4..767c988d 100644
--- a/openapi/components/schemas/CurrentUser.yaml
+++ b/openapi/components/schemas/CurrentUser.yaml
@@ -161,7 +161,7 @@ properties:
         isMobile:
           type: boolean
         platform:
-          type: string
+          $ref: ./Platform.yaml
           nullable: true
         recorded:
           type: string
diff --git a/openapi/components/schemas/CurrentUserPresence.yaml b/openapi/components/schemas/CurrentUserPresence.yaml
index 676a37f9..02401ea3 100644
--- a/openapi/components/schemas/CurrentUserPresence.yaml
+++ b/openapi/components/schemas/CurrentUserPresence.yaml
@@ -28,7 +28,7 @@ properties:
     type: string
     nullable: true
   platform:
-    type: string
+    $ref: ./Platform.yaml
     description: either a Platform or an empty string
     nullable: true
   profilePicOverride:
diff --git a/openapi/components/schemas/DynamicContentRow.yaml b/openapi/components/schemas/DynamicContentRow.yaml
index 08c4aad4..59953774 100644
--- a/openapi/components/schemas/DynamicContentRow.yaml
+++ b/openapi/components/schemas/DynamicContentRow.yaml
@@ -9,7 +9,7 @@ properties:
     type: string
   platform:
     minLength: 1
-    type: string
+    $ref: ./Platform.yaml
     description: 'Usually "ThisPlatformSupported", but can also be other values such as "all" or platform specific identifiers.'
   sortHeading:
     minLength: 1
@@ -23,7 +23,7 @@ properties:
   tag:
     description: Tag to filter content for this row.
     minLength: 1
-    type: string
+    $ref: ./Tag.yaml
   type:
     type: string
     example: avatar
diff --git a/openapi/components/schemas/LimitedUserInstance.yaml b/openapi/components/schemas/LimitedUserInstance.yaml
index 343c36bb..a886658d 100644
--- a/openapi/components/schemas/LimitedUserInstance.yaml
+++ b/openapi/components/schemas/LimitedUserInstance.yaml
@@ -48,7 +48,7 @@ properties:
     nullable: true
     format: date-time
   platform:
-    type: string
+    $ref: ./Platform.yaml
   profilePicOverride:
     type: string
   profilePicOverrideThumbnail:
diff --git a/openapi/components/schemas/NotificationDetailRequestInvite.yaml b/openapi/components/schemas/NotificationDetailRequestInvite.yaml
index 0954e0d0..f63fbd3f 100644
--- a/openapi/components/schemas/NotificationDetailRequestInvite.yaml
+++ b/openapi/components/schemas/NotificationDetailRequestInvite.yaml
@@ -1,7 +1,7 @@
 properties:
   platform:
     description: 'TODO: Does this still exist?'
-    type: string
+    $ref: ./Platform.yaml
   requestMessage:
     description: Used when using InviteMessage Slot.
     type: string