diff --git a/.npmrc b/.npmrc
deleted file mode 100644
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-@matrix-org:registry=https://gitlab.matrix.org/api/v4/projects/27/packages/npm/
diff --git a/keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
rename from keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js
rename to keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js
+++ b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -1,7 +1,7 @@
 // flow-typed signature: 085f002da86534cfd8cee47ffa99dd67
-// flow-typed version: <<STUB>>/@matrix-org/olm_v3.2.4/flow_v0.182.0
+// flow-typed version: <<STUB>>/@commapp/olm_v3.2.4/flow_v0.182.0
 
-declare module '@matrix-org/olm' {
+declare module '@commapp/olm' {
 
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
diff --git a/keyserver/package.json b/keyserver/package.json
--- a/keyserver/package.json
+++ b/keyserver/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@matrix-org/olm": "3.2.14",
+    "@commapp/olm": "0.0.4",
     "@parse/node-apn": "^3.2.0",
     "@vingle/bmp-js": "^0.2.5",
     "JSONStream": "^1.3.5",
diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 import cluster from 'cluster';
 import cookieParser from 'cookie-parser';
 import { detect as detectBrowser } from 'detect-browser';
diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -1,6 +1,6 @@
 // @flow
 
-import type { Utility as OlmUtility } from '@matrix-org/olm';
+import type { Utility as OlmUtility } from '@commapp/olm';
 import invariant from 'invariant';
 import { getRustAPI } from 'rust-node-addon';
 import { ErrorTypes, SiweMessage } from 'siwe';
diff --git a/keyserver/src/scripts/generate-olm-config.js b/keyserver/src/scripts/generate-olm-config.js
--- a/keyserver/src/scripts/generate-olm-config.js
+++ b/keyserver/src/scripts/generate-olm-config.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 import fs from 'fs';
 import path from 'path';
 import uuid from 'uuid';
diff --git a/keyserver/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
--- a/keyserver/src/utils/olm-utils.js
+++ b/keyserver/src/utils/olm-utils.js
@@ -1,7 +1,7 @@
 // @flow
 
-import olm from '@matrix-org/olm';
-import type { Utility as OlmUtility } from '@matrix-org/olm';
+import olm from '@commapp/olm';
+import type { Utility as OlmUtility } from '@commapp/olm';
 import invariant from 'invariant';
 
 import { getCommConfig } from 'lib/utils/comm-config.js';
diff --git a/keyserver/src/utils/olm-utils.test.js b/keyserver/src/utils/olm-utils.test.js
--- a/keyserver/src/utils/olm-utils.test.js
+++ b/keyserver/src/utils/olm-utils.test.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 
 import { getOlmUtility } from '../utils/olm-utils.js';
 
diff --git a/web/account/log-in-form.react.js b/web/account/log-in-form.react.js
--- a/web/account/log-in-form.react.js
+++ b/web/account/log-in-form.react.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 import { useConnectModal } from '@rainbow-me/rainbowkit';
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
diff --git a/web/flow-typed/npm/@matrix-org/olm_vx.x.x.js b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
rename from web/flow-typed/npm/@matrix-org/olm_vx.x.x.js
rename to web/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/web/flow-typed/npm/@matrix-org/olm_vx.x.x.js
+++ b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -1,7 +1,7 @@
 // flow-typed signature: 085f002da86534cfd8cee47ffa99dd67
-// flow-typed version: <<STUB>>/@matrix-org/olm_v3.2.4/flow_v0.182.0
+// flow-typed version: <<STUB>>/@commapp/olm_v3.2.4/flow_v0.182.0
 
-declare module '@matrix-org/olm' {
+declare module '@commapp/olm' {
 
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
diff --git a/web/olm/olm-utils.js b/web/olm/olm-utils.js
--- a/web/olm/olm-utils.js
+++ b/web/olm/olm-utils.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 
 declare var olmFilename: string;
 
diff --git a/web/olm/olm.test.js b/web/olm/olm.test.js
--- a/web/olm/olm.test.js
+++ b/web/olm/olm.test.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 
 describe('olm.Account', () => {
   it('should construct an empty olm.Account', async () => {
diff --git a/web/package.json b/web/package.json
--- a/web/package.json
+++ b/web/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
+    "@commapp/olm": "0.0.4",
     "@commapp/opaque-ke-wasm": "npm:@commapp/opaque-ke-wasm@^0.0.3",
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
diff --git a/web/selectors/socket-selectors.js b/web/selectors/socket-selectors.js
--- a/web/selectors/socket-selectors.js
+++ b/web/selectors/socket-selectors.js
@@ -1,6 +1,6 @@
 // @flow
 
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
 import { createSelector } from 'reselect';
 
 import {
diff --git a/web/webpack.config.cjs b/web/webpack.config.cjs
--- a/web/webpack.config.cjs
+++ b/web/webpack.config.cjs
@@ -52,7 +52,7 @@
     new CopyPlugin({
       patterns: [
         {
-          from: 'node_modules/@matrix-org/olm/olm.wasm',
+          from: 'node_modules/@commapp/olm/olm.wasm',
           to: path.join(__dirname, 'dist'),
         },
       ],
@@ -76,7 +76,7 @@
     new CopyPlugin({
       patterns: [
         {
-          from: 'node_modules/@matrix-org/olm/olm.wasm',
+          from: 'node_modules/@commapp/olm/olm.wasm',
           to: path.join(__dirname, 'dist', 'olm.[contenthash:12].wasm'),
         },
       ],
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -1719,6 +1719,11 @@
     stream-browserify "^3.0.0"
     util "^0.12.4"
 
+"@commapp/olm@0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@commapp/olm/-/olm-0.0.4.tgz#cbab890fdc8767ea5336b052d6b0f9ea698ffd36"
+  integrity sha512-gEh2QAMRzH21EKncwL9jTUdVD+ZgBRmKW0Q+RGe0P1R12iJq5PW6xZJFgV+tQLnhgVZviKNlz1R8KphXhSy2ww==
+
 "@commapp/opaque-ke-wasm@npm:@commapp/opaque-ke-wasm@^0.0.3":
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/@commapp/opaque-ke-wasm/-/opaque-ke-wasm-0.0.3.tgz#789b7351e593932461858658c61da5c2de51dc03"