diff --git a/daemon.py b/daemon.py
index 15191310..66f1d1d6 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3772,6 +3772,22 @@ class PubServer(BaseHTTPRequestHandler):
                         # which isn't implemented in Epicyon
                         actorJson['discoverable'] = False
                         actorChanged = True
+                    if not actorJson['@context'].get('orgSchema'):
+                        actorJson['@context']['orgSchema'] = 'toot:orgSchema'
+                        actorChanged = True
+                    if not actorJson['@context'].get('skills'):
+                        actorJson['@context']['skills'] = 'toot:skills'
+                        actorChanged = True
+                    if not actorJson['@context'].get('roles'):
+                        actorJson['@context']['roles'] = 'toot:roles'
+                        actorChanged = True
+                    if not actorJson['@context'].get('availability'):
+                        actorJson['@context']['availaibility'] = \
+                            'toot:availability'
+                        actorChanged = True
+                    if actorJson.get('capabilityAcquisitionEndpoint'):
+                        del actorJson['capabilityAcquisitionEndpoint']
+                        actorChanged = True
                     # update the avatar/image url file extension
                     uploads = profileMediaTypesUploaded.items()
                     for mType, lastPart in uploads:
diff --git a/person.py b/person.py
index 9fcf099d..6886421d 100644
--- a/person.py
+++ b/person.py
@@ -191,7 +191,12 @@ def getDefaultPersonContext() -> str:
         'fingerprintKey': {'@id': 'toot:fingerprintKey', '@type': '@id'},
         'messageFranking': 'toot:messageFranking',
         'publicKeyBase64': 'toot:publicKeyBase64',
-        'discoverable': 'toot:discoverable'
+        'discoverable': 'toot:discoverable',
+        'orgSchema': 'toot:orgSchema',
+        'shares': 'toot:shares',
+        'skills': 'toot:skills',
+        'roles': 'toot:roles',
+        'availability': 'toot:availability'
     }