diff --git a/apps/leafcutter/.gitlab-ci.yml b/apps/leafcutter/.gitlab-ci.yml
index ffce17e..2f7e0d7 100644
--- a/apps/leafcutter/.gitlab-ci.yml
+++ b/apps/leafcutter/.gitlab-ci.yml
@@ -10,7 +10,7 @@ leafcutter-docker-build:
     - docker:dind
   stage: docker-build
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/leafcutter
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/leafcutter
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -22,7 +22,7 @@ leafcutter-docker-release:
     - docker:dind
   stage: docker-release
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/leafcutter
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/leafcutter
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
   only:
diff --git a/apps/leafcutter/Makefile b/apps/leafcutter/Makefile
index ad9fd8f..7ab9a76 100644
--- a/apps/leafcutter/Makefile
+++ b/apps/leafcutter/Makefile
@@ -2,7 +2,7 @@ PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
 PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
 BUILD_DATE   ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 DOCKER_ARGS  ?=
-DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME}
+DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/link-stack/${PACKAGE_NAME}
 DOCKER_TAG   ?= test
 DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE}
 DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache
diff --git a/apps/leafcutter/package.json b/apps/leafcutter/package.json
index d54c120..5aff75e 100644
--- a/apps/leafcutter/package.json
+++ b/apps/leafcutter/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.54",
   "scripts": {
     "dev": "next dev",
-    "login": "aws sso login --profile cdr-leafcutter-dashboard-prod-sso",
-    "kubeconfig": "aws eks update-kubeconfig --name cdr-leafcutter-dashboard-cluster --profile  cdr-leafcutter-dashboard-prod-sso",
+    "login": "aws sso login --profile cdr-leafcutter-dashboard-production",
+    "kubeconfig": "aws eks update-kubeconfig --name cdr-leafcutter-dashboard-cluster --profile  cdr-leafcutter-dashboard-production",
     "fwd:opensearch": "kubectl port-forward opensearch-cluster-master-0 9200:9200 --namespace leafcutter",
     "fwd:dashboards": "kubectl port-forward opensearch-dashboards-1-59854cdb9b-vgmtf 5602:5601 --namespace leafcutter",
     "build": "next build",
diff --git a/apps/link/.gitlab-ci.yml b/apps/link/.gitlab-ci.yml
index 6438900..cc8032a 100644
--- a/apps/link/.gitlab-ci.yml
+++ b/apps/link/.gitlab-ci.yml
@@ -10,7 +10,7 @@ link-docker-build:
     - docker:dind
   stage: docker-build
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -22,7 +22,7 @@ link-docker-release:
     - docker:dind
   stage: docker-release
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
   only:
diff --git a/apps/link/Makefile b/apps/link/Makefile
index 53b7943..416a9bb 100644
--- a/apps/link/Makefile
+++ b/apps/link/Makefile
@@ -2,7 +2,7 @@ PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
 PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
 BUILD_DATE   ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 DOCKER_ARGS  ?=
-DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME}
+DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/link-stack/${PACKAGE_NAME}
 DOCKER_TAG   ?= test
 DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE}
 DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache