diff --git a/README.md b/README.md
index 7f2ea54f..145420e3 100644
--- a/README.md
+++ b/README.md
@@ -113,19 +113,19 @@ Our design philosophy ensures that p0tion stands as the optimal choice for runni
        <tr>
             <td>
                 <a href="/packages/phase2cli">
-                    @p0tion/phase2cli
+                    @ethstorage-io/phase2cli
                 </a>
             </td>
             <td>
                 <!-- NPM version -->
-                <a href="https://npmjs.org/package/@p0tion/phase2cli">
-                    <img src="https://img.shields.io/npm/v/@p0tion/phase2cli.svg?style=flat-square" alt="NPM version" />
+                <a href="https://npmjs.org/package/@ethstorage-io/phase2cli">
+                    <img src="https://img.shields.io/npm/v/@ethstorage-io/phase2cli.svg?style=flat-square" alt="NPM version" />
                 </a>
             </td>
             <td>
                 <!-- Downloads -->
-                <a href="https://npmjs.org/package/@p0tion/phase2cli">
-                    <img src="https://img.shields.io/npm/dm/@p0tion/phase2cli.svg?style=flat-square" alt="Downloads" />
+                <a href="https://npmjs.org/package/@ethstorage-io/phase2cli">
+                    <img src="https://img.shields.io/npm/dm/@ethstorage-io/phase2cli.svg?style=flat-square" alt="Downloads" />
                 </a>
             </td>
         </tr>
@@ -138,7 +138,7 @@ Our design philosophy ensures that p0tion stands as the optimal choice for runni
 Clone this repository
 
 ```bash
-git clone https://github.com/privacy-scaling-explorations/p0tion.git
+git clone https://github.com/ethstorage/p0tion.git
 ```
 
 Install the dependencies
diff --git a/RELEASE.md b/RELEASE.md
index 2a8d43b9..8a221e2d 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -7,7 +7,7 @@ To release a new version of `p0tion`, the following steps can be taken:
 2. Clone `p0tion`:
 
 ```
-git clone https://github.com/privacy-scaling-explorations/p0tion.git
+git clone https://github.com/ethstorage/p0tion.git
 ```
 
 3. Install required dependencies:
@@ -59,4 +59,4 @@ Once the tag is pushed, GitHub Actions will automatically publish the packages t
 
 -   @p0tion/actions
 -   @p0tion/backend
--   @p0tion/phase2cli
+-   @ethstorage-io/phase2cli
diff --git a/docs/index.html b/docs/index.html
index 63a97903..ebd7f4c6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -48,7 +48,7 @@ <h1 style="margin: 0; font-size: 40px">🧪 p0tion packages</h1>
                     <a
                         style="margin-right: 15px; text-decoration: none"
                         target="_blank"
-                        href="https://github.com/privacy-scaling-explorations/p0tion"
+                        href="https://github.com/ethstorage/p0tion"
                     >
                         <i class="fa fa-github" style="font-size: 24px; color: #000"></i>
                     </a>
@@ -57,7 +57,7 @@ <h1 style="margin: 0; font-size: 40px">🧪 p0tion packages</h1>
         </footer>
     </body>
     <script>
-        const url = "https://api.github.com/repos/privacy-scaling-explorations/p0tion/contents?ref=gh-pages"
+        const url = "https://api.github.com/repos/ethstorage/p0tion/contents?ref=gh-pages"
 
         function insertLinks(packages) {
             const [element] = window.document.getElementsByTagName("ul")
@@ -65,14 +65,14 @@ <h1 style="margin: 0; font-size: 40px">🧪 p0tion packages</h1>
 
             for (const package of packages) {
                 html += `<li style="display: flex; align-items: center; margin-bottom: 8px">
-            <a style="margin-right: 15px" target="_blank" href="https://github.com/privacy-scaling-explorations/p0tion/tree/main/packages/${package}">
+            <a style="margin-right: 15px" target="_blank" href="https://github.com/ethstorage/p0tion/tree/main/packages/${package}">
               <i class="fa fa-github" style="font-size: 24px; color: #000"></i>
             </a>
             <a style="color: #000; text-decoration: none; font-size: 16px"
               onmouseover="this.style.color='#404A4E';"
               onmouseout="this.style.color='#000';"
-              target="_blank" href="https://privacy-scaling-explorations.github.io/p0tion/${package}">
-                @privacy-scaling-explorations/${package} >
+              target="_blank" href="https://ethstorage.github.io/p0tion/${package}">
+                @ethstorage-io/${package} >
             </a></li>`
             }
 
diff --git a/package.json b/package.json
index 58b9fa41..f6cb23a2 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-    "name": "p0tion",
+    "name": "ethstorge-org",
     "description": "MPC Phase 2 suite of tools for conducting zkSNARKs trusted setup ceremonies",
-    "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
-    "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
-    "bugs": "https://github.com/privacy-scaling-explorations/p0tion/issues",
+    "repository": "git@github.com:ethstorage/p0tion.git",
+    "homepage": "https://github.com/ethstorage/p0tion",
+    "bugs": "https://github.com/ethstorage/p0tion/issues",
     "license": "MIT",
     "private": true,
     "keywords": [
diff --git a/packages/backend/.firebaserc b/packages/backend/.firebaserc
index 950d84f1..b9a4ace6 100644
--- a/packages/backend/.firebaserc
+++ b/packages/backend/.firebaserc
@@ -1,6 +1,6 @@
 {
   "projects": {
     "dev": "demo-p0tion",
-    "prod": "p0tion-ci-environment"
+    "prod": "ethstorage-trusted-setup"
   }
 }
diff --git a/packages/backend/aws/lambda/index.mjs b/packages/backend/aws/lambda/index.mjs
index 21d2f49c..eb52c207 100644
--- a/packages/backend/aws/lambda/index.mjs
+++ b/packages/backend/aws/lambda/index.mjs
@@ -1,6 +1,6 @@
 import { EC2Client, DescribeInstancesCommand, StopInstancesCommand, CreateTagsCommand } from "@aws-sdk/client-ec2"
 
-const ec2 = new EC2Client({ region: "us-east-1" })
+const ec2 = new EC2Client({ region: "us-west-2" })
 
 export const handler = async (event) => {
     console.log("Received event:", JSON.stringify(event, null, 2))
diff --git a/packages/backend/aws/main.tf b/packages/backend/aws/main.tf
index 6886ca02..129c3402 100644
--- a/packages/backend/aws/main.tf
+++ b/packages/backend/aws/main.tf
@@ -1,5 +1,5 @@
 provider "aws" {
-    region = "us-east-1"
+    region = "us-west-2"
 }
 
 # create SNS
@@ -88,7 +88,7 @@ resource "aws_sns_topic_subscription" "lambda" {
 data "aws_iam_policy_document" "p0tion_assume_role_policy_ec2" {
     statement {
         actions = ["sts:AssumeRole"]
-    
+
         principals {
             type        = "Service"
             identifiers = ["ec2.amazonaws.com"]
@@ -110,7 +110,7 @@ resource "aws_iam_instance_profile" "p0tion_ec2_instance_profile" {
 # EC2 SNS policy
 resource "aws_iam_role_policy" "p0tion_ec2_sns" {
     name = "p0tion_ec2_sns"
-    role = aws_iam_role.p0tion_ec2_role.id 
+    role = aws_iam_role.p0tion_ec2_role.id
 
     policy = <<EOF
 {
@@ -130,7 +130,7 @@ resource "aws_iam_role_policy" "p0tion_ec2_sns" {
 # EC2 S3 and SSM policy
 resource "aws_iam_role_policy" "p0tion_ec2_s3_ssm" {
     name = "p0tion_ec2_s3_ssm"
-    role = aws_iam_role.p0tion_ec2_role.id 
+    role = aws_iam_role.p0tion_ec2_role.id
 
     policy = <<EOF
 {
@@ -157,7 +157,7 @@ resource "aws_iam_role_policy" "p0tion_ec2_s3_ssm" {
     EOF
 }
 
-# IAM user for all operations 
+# IAM user for all operations
 resource "aws_iam_user" "p0tion_iam_user" {
     name = "p0tion_iam_user"
 }
@@ -285,4 +285,4 @@ output "p0tion_ec2_role_arn" {
 output "p0tion_sns_topic_arn" {
     value = aws_sns_topic.p0tion_sns_topic.arn
     description = "The sns topic arn to put in the .env"
-}
\ No newline at end of file
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 99ac2731..0ea28d73 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -50,7 +50,7 @@
         "docs": "typedoc src/**/*.ts --out ../../docs/backend"
     },
     "devDependencies": {
-        "@firebase/rules-unit-testing": "^2.0.7",
+        "@firebase/rules-unit-testing": "^3.0.2",
         "@types/rollup-plugin-auto-external": "^2.0.2",
         "@types/uuid": "^9.0.1",
         "firebase-functions-test": "^3.1.0",
diff --git a/packages/phase2cli/README.md b/packages/phase2cli/README.md
index d5b10cb4..39338940 100644
--- a/packages/phase2cli/README.md
+++ b/packages/phase2cli/README.md
@@ -6,17 +6,17 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/privacy-scaling-explorations/p0tion">
+    <a href="https://github.com/ethstorage/p0tion">
         <img src="https://img.shields.io/badge/project-p0tion-blue.svg?style=flat-square">
     </a>
-    <a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/LICENSE">
+    <a href="https://github.com/ethstorage/p0tion/blob/main/LICENSE">
         <img alt="Github License" src="https://img.shields.io/github/license/privacy-scaling-explorations/p0tion.svg?style=flat-square">
     </a>
-    <a href="https://www.npmjs.com/package/@p0tion/phase2cli">
-        <img alt="NPM Version" src="https://img.shields.io/npm/v/@p0tion/phase2cli?style=flat-square" />
+    <a href="https://www.npmjs.com/package/@ethstorage-io/phase2cli">
+        <img alt="NPM Version" src="https://img.shields.io/npm/v/@ethstorage-io/phase2cli?style=flat-square" />
     </a>
-    <a href="https://npmjs.org/package/@p0tion/phase2cli">
-        <img alt="Downloads" src="https://img.shields.io/npm/dm/@p0tion/phase2cli.svg?style=flat-square" />
+    <a href="https://npmjs.org/package/@ethstorage-io/phase2cli">
+        <img alt="Downloads" src="https://img.shields.io/npm/dm/@ethstorage-io/phase2cli.svg?style=flat-square" />
     </a>
     <a href="https://eslint.org/">
         <img alt="Linter" src="https://img.shields.io/badge/linter-eslint-8080f2?style=flat-square&logo=eslint" />
@@ -28,11 +28,11 @@
 
 <div align="center">
     <h4>
-        <a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/CONTRIBUTING.md">
+        <a href="https://github.com/ethstorage/p0tion/blob/main/CONTRIBUTING.md">
             👥 Contributing
         </a>
         <span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
-        <a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/CODE_OF_CONDUCT.md">
+        <a href="https://github.com/ethstorage/p0tion/blob/main/CODE_OF_CONDUCT.md">
             🤝 Code of conduct
         </a>
         <span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
@@ -49,16 +49,16 @@ Rounding up the option of using a unique tool for different ceremony stages make
 
 ## 🛠 Installation
 
-Install the `@p0tion/phase2cli` package globally
+Install the `@ethstorage-io/phase2cli` package globally
 
 ```bash
-npm i -g @p0tion/phase2cli
+npm i -g @ethstorage-io/phase2cli
 ```
 
 or run specific commands with `npx`:
 
 ```bash
-npx @p0tion/phase2cli contribute
+npx @ethstorage-io/phase2cli contribute
 ```
 
 > Please note that phase2cli only runs on Linux or Mac systems. If a Windows user, please install [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install) first.
diff --git a/packages/phase2cli/package.json b/packages/phase2cli/package.json
index e9e09b71..5fa9eaa9 100644
--- a/packages/phase2cli/package.json
+++ b/packages/phase2cli/package.json
@@ -1,11 +1,11 @@
 {
-    "name": "@p0tion/phase2cli",
+    "name": "@ethstorage-io/phase2cli",
     "type": "module",
-    "version": "1.2.4",
+    "version": "1.2.12",
     "description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
-    "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
-    "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
-    "bugs": "https://github.com/privacy-scaling-explorations/p0tion/issues",
+    "repository": "git@github.com:ethstorage/p0tion.git",
+    "homepage": "https://github.com/ethstorage/p0tion",
+    "bugs": "https://github.com/ethstorage/p0tion/issues",
     "license": "MIT",
     "bin": "dist/index.js",
     "main": "dist/index.js",
@@ -14,6 +14,7 @@
         "node": ">=16.14.0"
     },
     "files": [
+        "dist/.env",
         "dist/",
         "src/",
         "types/",
diff --git a/packages/phase2cli/src/lib/utils.ts b/packages/phase2cli/src/lib/utils.ts
index eb83d6e5..1614d19e 100644
--- a/packages/phase2cli/src/lib/utils.ts
+++ b/packages/phase2cli/src/lib/utils.ts
@@ -328,7 +328,7 @@ export const generateCustomUrlToTweetAboutParticipation = (
               ceremonyName.toLowerCase().includes("ceremony")
                   ? "!"
                   : "%20Phase%202%20Trusted%20Setup%20ceremony!"
-          }%20You%20can%20view%20the%20steps%20to%20contribute%20here:%20https://ceremony.pse.dev%20You%20can%20view%20my%20attestation%20here:%20${gistUrl}%20#Ethereum%20#ZKP`
+          }%20You%20can%20view%20the%20steps%20to%20contribute%20here:%20https://ceremony.ethstorage.io%20You%20can%20view%20my%20attestation%20here:%20${gistUrl}%20#Ethereum%20#ZKP`
 
 /**
  * Return a custom progress bar.
diff --git a/yarn.lock b/yarn.lock
index aaaa10ab..013a370e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4794,9 +4794,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@p0tion/phase2cli@workspace:packages/phase2cli":
+"@ethstorage-io/phase2cli@workspace:packages/phase2cli":
   version: 0.0.0-use.local
-  resolution: "@p0tion/phase2cli@workspace:packages/phase2cli"
+  resolution: "@ethstorage-io/phase2cli@workspace:packages/phase2cli"
   dependencies:
     "@adobe/node-fetch-retry": ^2.2.0
     "@aws-sdk/client-s3": ^3.329.0