diff --git a/deployment/docker/docker-compose-build.yml b/deployment/docker/docker-compose-build.yml
index 235690a..8e621d9 100644
--- a/deployment/docker/docker-compose-build.yml
+++ b/deployment/docker/docker-compose-build.yml
@@ -4,20 +4,20 @@ services:
 
   discovery-service:
     build: .
-    image: hyperskale/discovery-service:0.0.1-SNAPSHOT
+    image: hyperscale/discovery-service:0.0.1-SNAPSHOT
 
   edge-service:
     build: .
-    image: hyperskale/edge-service:0.0.1-SNAPSHOT
+    image: hyperscale/edge-service:0.0.1-SNAPSHOT
 
   friend-service:
     build: .
-    image: hyperskale/friend-service:0.0.2-SNAPSHOT
+    image: hyperscale/friend-service:0.0.2-SNAPSHOT
 
   user-service:
     build: .
-    image: hyperskale/user-service:0.0.2-SNAPSHOT
+    image: hyperscale/user-service:0.0.2-SNAPSHOT
 
   recommendation-service:
     build: .
-    image: hyperskale/recommendation-service:0.0.1-SNAPSHOT
+    image: hyperscale/recommendation-service:0.0.1-SNAPSHOT
diff --git a/deployment/helm/edge-service/Chart.yaml b/deployment/helm/edge-service/Chart.yaml
index 7446620..d78683f 100644
--- a/deployment/helm/edge-service/Chart.yaml
+++ b/deployment/helm/edge-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.0.1-SNAPSHOT"
-description: Helm chart for the edge microservice in hyperskale/social-network
+description: Helm chart for the edge microservice in hyperscale/social-network
 name: edge-service
 version: 0.1.0
diff --git a/deployment/helm/edge-service/values.yaml b/deployment/helm/edge-service/values.yaml
index 98d1580..a9f3d97 100644
--- a/deployment/helm/edge-service/values.yaml
+++ b/deployment/helm/edge-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: hyperskale/edge-service
+  repository: hyperscale/edge-service
   tag: 0.0.1-SNAPSHOT
   pullPolicy: Always
 
diff --git a/deployment/helm/friend-service/Chart.yaml b/deployment/helm/friend-service/Chart.yaml
index 44c16a1..9e61159 100644
--- a/deployment/helm/friend-service/Chart.yaml
+++ b/deployment/helm/friend-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.0.2-SNAPSHOT"
-description: Helm chart for the friend microservice in hyperskale/social-network
+description: Helm chart for the friend microservice in hyperscale/social-network
 name: friend-service
 version: 0.2.0
diff --git a/deployment/helm/friend-service/values.yaml b/deployment/helm/friend-service/values.yaml
index 9d9107c..63f3572 100644
--- a/deployment/helm/friend-service/values.yaml
+++ b/deployment/helm/friend-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: hyperskale/friend-service
+  repository: hyperscale/friend-service
   tag: 0.0.2-SNAPSHOT
   pullPolicy: Always
 
diff --git a/deployment/helm/recommendation-service/Chart.yaml b/deployment/helm/recommendation-service/Chart.yaml
index 09ab5bb..82cdec9 100644
--- a/deployment/helm/recommendation-service/Chart.yaml
+++ b/deployment/helm/recommendation-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.0.1-SNAPSHOT"
-description: Helm chart for the recommendation microservice in hyperskale/social-network
+description: Helm chart for the recommendation microservice in hyperscale/social-network
 name: recommendation-service
 version: 0.1.0
diff --git a/deployment/helm/recommendation-service/values.yaml b/deployment/helm/recommendation-service/values.yaml
index 5ad7070..c2be6a8 100644
--- a/deployment/helm/recommendation-service/values.yaml
+++ b/deployment/helm/recommendation-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: hyperskale/recommendation-service
+  repository: hyperscale/recommendation-service
   tag: 0.0.1-SNAPSHOT
   pullPolicy: Always
 
diff --git a/deployment/helm/social-network/Chart.yaml b/deployment/helm/social-network/Chart.yaml
index d98e213..bb6c7db 100644
--- a/deployment/helm/social-network/Chart.yaml
+++ b/deployment/helm/social-network/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.0.1-SNAPSHOT"
-description: A Helm chart for Hyerskale Social Network
+description: A Helm chart for Hyperscale Social Network
 name: social-network
 version: 0.1.0
diff --git a/deployment/helm/social-network/README.md b/deployment/helm/social-network/README.md
index 80ca4a1..a89a317 100644
--- a/deployment/helm/social-network/README.md
+++ b/deployment/helm/social-network/README.md
@@ -1,4 +1,4 @@
-# Deploy Hyerskale Social Network via Helm
+# Deploy Hyperscale Social Network via Helm
 
 ## Prerequisites
 
@@ -29,7 +29,7 @@ helm init --service-account=tiller
 Clone this repo locally:
 
 ```bash
-git clone https://github.com/hyperskale/social-network-example.git
+git clone https://github.com/hyperscale/social-network-example.git
 cd social-network-example
 ```
 
diff --git a/deployment/helm/user-service/Chart.yaml b/deployment/helm/user-service/Chart.yaml
index 3e922d0..734e0fd 100644
--- a/deployment/helm/user-service/Chart.yaml
+++ b/deployment/helm/user-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.0.2-SNAPSHOT"
-description: Helm chart for the user microservice in hyperskale/social-network
+description: Helm chart for the user microservice in hyperscale/social-network
 name: user-service
 version: 0.2.0
diff --git a/deployment/helm/user-service/values.yaml b/deployment/helm/user-service/values.yaml
index 90fe9ae..71e060f 100644
--- a/deployment/helm/user-service/values.yaml
+++ b/deployment/helm/user-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: hyperskale/user-service
+  repository: hyperscale/user-service
   tag: 0.0.2-SNAPSHOT
   pullPolicy: Always
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c02ff1..cc03f96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: docker
       PROMETHEUS_URL: "prometheus-pushgateway:9091"
-    image: hyperskale/discovery-service:0.0.1-SNAPSHOT
+    image: hyperscale/discovery-service:0.0.1-SNAPSHOT
     ports:
       - "8761:8761/tcp"
     deploy:
@@ -16,7 +16,7 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: docker
       PROMETHEUS_URL: "prometheus-pushgateway:9091"
-    image: hyperskale/edge-service:0.0.1-SNAPSHOT
+    image: hyperscale/edge-service:0.0.1-SNAPSHOT
     ports:
       - "9000:9000/tcp"
     deploy:
@@ -33,7 +33,7 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: docker
       PROMETHEUS_URL: "prometheus-pushgateway:9091"
-    image: hyperskale/friend-service:0.0.2-SNAPSHOT
+    image: hyperscale/friend-service:0.0.2-SNAPSHOT
     deploy:
       replicas: 1
       resources:
@@ -48,7 +48,7 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: docker
       PROMETHEUS_URL: "prometheus-pushgateway:9091"
-    image: hyperskale/user-service:0.0.2-SNAPSHOT
+    image: hyperscale/user-service:0.0.2-SNAPSHOT
     deploy:
       replicas: 1
       resources:
@@ -63,7 +63,7 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: docker
       PROMETHEUS_URL: "prometheus-pushgateway:9091"
-    image: hyperskale/recommendation-service:0.0.1-SNAPSHOT
+    image: hyperscale/recommendation-service:0.0.1-SNAPSHOT
     deploy:
       replicas: 1
       resources:
diff --git a/pom.xml b/pom.xml
index 4770451..3ce30ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>11</java.version>
         <spring-cloud.version>2021.0.5</spring-cloud.version>
-        <docker.user>hyperskale</docker.user>
+        <docker.user>hyperscale</docker.user>
     </properties>
 
     <modules>