diff --git a/.drone.yml b/.drone.yml
index f4781ee..52689ef 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ clone:
 # npm config set _auth token add command
 steps:
   - name: clone
-    image: docker.willaspace.com/repository/docker-hosted/alpine/git
+    image: docker.meshkee.com/repository/docker-hosted/alpine/git
     commands:
       - git clone $DRONE_GIT_HTTP_URL .
       - git checkout $DRONE_COMMIT
@@ -26,8 +26,8 @@ steps:
         - latest
         - v.${DRONE_BUILD_NUMBER}
       dockerfile: Dockerfile
-      registry: docker.willaspace.com
-      repo: docker.willaspace.com/repository/docker-hosted/cssd/cssd-front
+      registry: docker.meshkee.com
+      repo: docker.meshkee.com/repository/docker-hosted/cssd/cssd-front
       build_args_from_env:
         - REGISTRY_TOKEN
         - REGISTRY_PROXY
@@ -41,7 +41,7 @@ steps:
 
 #  # Define deploy step using Helm chart
   - name: deploy
-    image: docker.willaspace.com/repository/docker-hosted/pelotech/drone-helm3:latest
+    image: docker.meshkee.com/repository/docker-hosted/pelotech/drone-helm3:latest
     environment:
       USERNAME:
         from_secret: registry_username
@@ -59,7 +59,7 @@ steps:
       release: cssd-front
       namespace: cssd
       add_repos:
-        - willaspace=https://$USERNAME:$PASSWORD@repo.willaspace.com/repository/willaspace-charts/
+        - willaspace=https://$USERNAME:$PASSWORD@repo.meshkee.com/repository/willaspace-charts/
       values_files:
         - .values.yaml
       values:
diff --git a/.values.yaml b/.values.yaml
index 3d1db7f..3f9d9f7 100644
--- a/.values.yaml
+++ b/.values.yaml
@@ -67,7 +67,7 @@ deployment:
 
   # Image of the app container
   image:
-    repository: docker.willaspace.com/repository/docker-hosted/cssd/cssd-front
+    repository: docker.meshkee.com/repository/docker-hosted/cssd/cssd-front
     tag: 'latest'
     digest: '' # if set to a non empty value, digest takes precedence on the tag
     pullPolicy: IfNotPresent
diff --git a/Dockerfile b/Dockerfile
index 7545c40..91cec2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.willaspace.com/repository/docker-hosted/node:14 as build-stage
+FROM docker.meshkee.com/repository/docker-hosted/node:14 as build-stage
 
 ARG REGISTRY_TOKEN