diff --git a/package-lock.json b/package-lock.json
index decf0d0..a24acda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "2.0.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
+				"@pretendonetwork/grpc": "^1.0.3",
 				"aws-sdk": "^2.1204.0",
 				"colors": "^1.4.0",
 				"crc": "^4.3.2",
@@ -25,7 +26,6 @@
 				"node-snowflake": "0.0.1",
 				"pako": "^1.0.11",
 				"pngjs": "^5.0.0",
-				"pretendo-grpc-ts": "github:PretendoNetwork/grpc-ts",
 				"tga": "^1.0.3",
 				"xmlbuilder": "^15.1.1",
 				"zod": "^3.21.4"
@@ -961,6 +961,20 @@
 				"node": "*"
 			}
 		},
+		"node_modules/@pretendonetwork/grpc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.3.tgz",
+			"integrity": "sha512-NlfzonmHqNRUDuc1nCON6u3f6II3KtSQgs7g5u4TEG8KKIIvBWKQT3mWVsRIkBEEpPdtad/dwASVzIR7lymKWw==",
+			"dependencies": {
+				"long": "^5.2.1",
+				"protobufjs": "^7.2.3"
+			}
+		},
+		"node_modules/@pretendonetwork/grpc/node_modules/long": {
+			"version": "5.2.3",
+			"resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+			"integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+		},
 		"node_modules/@protobufjs/aspromise": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
@@ -5187,21 +5201,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/pretendo-grpc-ts": {
-			"version": "1.0.0",
-			"resolved": "git+ssh://git@github.com/PretendoNetwork/grpc-ts.git#028bc63602eb3cf33ea5e775face04b4c586399c",
-			"hasInstallScript": true,
-			"license": "ISC",
-			"dependencies": {
-				"long": "^5.2.1",
-				"protobufjs": "^7.2.3"
-			}
-		},
-		"node_modules/pretendo-grpc-ts/node_modules/long": {
-			"version": "5.2.3",
-			"resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
-			"integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
-		},
 		"node_modules/pretty-ms": {
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
diff --git a/package.json b/package.json
index f5f4789..8dabcd7 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
 	],
 	"license": "AGPL-3.0",
 	"dependencies": {
+		"@pretendonetwork/grpc": "^1.0.3",
 		"aws-sdk": "^2.1204.0",
 		"colors": "^1.4.0",
 		"crc": "^4.3.2",
@@ -42,7 +43,6 @@
 		"node-snowflake": "0.0.1",
 		"pako": "^1.0.11",
 		"pngjs": "^5.0.0",
-		"pretendo-grpc-ts": "github:PretendoNetwork/grpc-ts",
 		"tga": "^1.0.3",
 		"xmlbuilder": "^15.1.1",
 		"zod": "^3.21.4"
diff --git a/src/middleware/auth.ts b/src/middleware/auth.ts
index 877ad7f..2604e71 100644
--- a/src/middleware/auth.ts
+++ b/src/middleware/auth.ts
@@ -1,7 +1,7 @@
 import express from 'express';
 import xmlbuilder from 'xmlbuilder';
 import { z } from 'zod';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { getEndpoint } from '@/database';
 import { getUserAccountData, getValueFromHeaders, decodeParamPack, getPIDFromServiceToken } from '@/util';
 import { HydratedEndpointDocument } from '@/types/mongoose/endpoint';
diff --git a/src/services/api/routes/friend_messages.ts b/src/services/api/routes/friend_messages.ts
index e25ba1f..f5d0051 100644
--- a/src/services/api/routes/friend_messages.ts
+++ b/src/services/api/routes/friend_messages.ts
@@ -4,7 +4,7 @@ import { Snowflake } from 'node-snowflake';
 import moment from 'moment';
 import xmlbuilder from 'xmlbuilder';
 import { z } from 'zod';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { getUserFriendPIDs, getUserAccountData, processPainting, uploadCDNAsset, getValueFromQueryString } from '@/util';
 import { getConversationByUsers, getUserSettings, getFriendMessages } from '@/database';
 import { LOG_WARN } from '@/logger';
diff --git a/src/services/api/routes/posts.ts b/src/services/api/routes/posts.ts
index c8ffb2b..93a94b3 100644
--- a/src/services/api/routes/posts.ts
+++ b/src/services/api/routes/posts.ts
@@ -2,7 +2,7 @@ import express from 'express';
 import multer from 'multer';
 import xmlbuilder from 'xmlbuilder';
 import { z } from 'zod';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { getUserAccountData, processPainting, uploadCDNAsset, getValueFromQueryString } from '@/util';
 import {
 	getPostByID,
diff --git a/src/services/api/routes/topics.ts b/src/services/api/routes/topics.ts
index 1451939..9713c00 100644
--- a/src/services/api/routes/topics.ts
+++ b/src/services/api/routes/topics.ts
@@ -1,7 +1,7 @@
 import express from 'express';
 import moment from 'moment';
 import xmlbuilder from 'xmlbuilder';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { getUserAccountData } from '@/util';
 import Cache from '@/cache';
 import { getEndpoint } from '@/database';
diff --git a/src/services/discovery/routes/discovery.ts b/src/services/discovery/routes/discovery.ts
index 5512469..15e4b5a 100644
--- a/src/services/discovery/routes/discovery.ts
+++ b/src/services/discovery/routes/discovery.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 import xmlbuilder from 'xmlbuilder';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 import { getUserAccountData } from '@/util';
 import { getEndpoint } from '@/database';
 import { HydratedEndpointDocument } from '@/types/mongoose/endpoint';
diff --git a/src/util.ts b/src/util.ts
index 97c23ba..1a38340 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -11,11 +11,11 @@ import { ParamPack } from '@/types/common/param-pack';
 import { config } from '@/config-manager';
 import { Token } from '@/types/common/token';
 
-import { FriendsDefinition } from 'pretendo-grpc-ts/dist/friends/friends_service';
-import { FriendRequest } from 'pretendo-grpc-ts/dist/friends/friend_request';
+import { FriendsDefinition } from '@pretendonetwork/grpc/friends/friends_service';
+import { FriendRequest } from '@pretendonetwork/grpc/friends/friend_request';
 
-import { AccountDefinition } from 'pretendo-grpc-ts/dist/account/account_service';
-import { GetUserDataResponse } from 'pretendo-grpc-ts/dist/account/get_user_data_rpc';
+import { AccountDefinition } from '@pretendonetwork/grpc/account/account_service';
+import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 
 // * nice-grpc doesn't export ChannelImplementation so this can't be typed
 const gRPCFriendsChannel = createChannel(`${config.grpc.friends.ip}:${config.grpc.friends.port}`);