diff --git a/Makefile b/Makefile
index 58790e1a..4b54dd55 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@
 all: build push
 
 build-arm:
-	docker buildx build --platform linux/arm64 -t fossorial/pangolin:latest .
+	docker buildx build --platform linux/arm64 -t fosrl/pangolin:latest .
 
 build-x86:
-	docker buildx build --platform linux/amd64 -t fossorial/pangolin:latest . 
+	docker buildx build --platform linux/amd64 -t fosrl/pangolin:latest . 
 
 build:
-	docker build -t fossorial/pangolin:latest .
+	docker build -t fosrl/pangolin:latest .
 
 push:
-	docker push fossorial/pangolin:latest
+	docker push fosrl/pangolin:latest
 
 test:
-	docker run -it -p 3000:3000 -p 3001:3001 -v ./config:/app/config fossorial/pangolin:latest
+	docker run -it -p 3000:3000 -p 3001:3001 -p 3002:3002 -v ./config:/app/config fosrl/pangolin:latest
 
 clean:
 	docker rmi pangolin
diff --git a/README.md b/README.md
index fd428add..176e8a79 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Pangolin
 
-Pangolin is a self-hosted tunneled reverse proxy management server with identity and access management, designed to securely expose private resources through encrypted [WireGuard](https://www.wireguard.com/) tunnels running in user space. With Pangolin, you retain full control over your infrastructure while providing a user-friendly and feature-rich solution for managing proxies, authentication, and access, and simplifying complex network setups, all with a clean and simple UI.
+Pangolin is a self-hosted tunneled reverse proxy management server with identity and access management, designed to securely expose private resources through use with the Traefik reverse proxy and Wireguard tunnel clients like Newt. With Pangolin, you retain full control over your infrastructure while providing a user-friendly and feature-rich solution for managing proxies, authentication, and access, and simplifying complex network setups, all with a clean and simple UI.
 
 ### Installation and Documentation
 
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index d22fed3d..31d70bee 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   pangolin:
-    image: fossorial/pangolin
+    image: fosrl/pangolin
     container_name: pangolin
     restart: unless-stopped
     ports:
@@ -17,7 +17,7 @@ services:
       retries: 5
 
   gerbil:
-    image: fossorial/gerbil
+    image: fosrl/gerbil
     container_name: gerbil
     restart: unless-stopped
     depends_on:
diff --git a/install/fs/docker-compose.yml b/install/fs/docker-compose.yml
index 6015beda..a320d3d0 100644
--- a/install/fs/docker-compose.yml
+++ b/install/fs/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   pangolin:
-    image: fossorial/pangolin
+    image: fosrl/pangolin
     container_name: pangolin
     restart: unless-stopped
     ports:
@@ -15,7 +15,7 @@ services:
       retries: 5
 
   gerbil:
-    image: fossorial/gerbil
+    image: fosrl/gerbil
     container_name: gerbil
     restart: unless-stopped
     depends_on:
diff --git a/package.json b/package.json
index 0b5efeef..483d5e19 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@fossorial/pangolin",
+    "name": "@fosrl/pangolin",
     "version": "1.0.0-beta.1",
     "private": true,
     "type": "module",