diff --git a/Makefile b/Makefile
index 17688976..567a5441 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,25 @@ TESTS = [api]
 # back to the version set in the CI values file, then to the chart default.
 IMAGE_TAG =
 
-# UI_IMAGE_TAG controls the tag used for the ui image used in the charts
-UI_IMAGE_TAG =
-UI_IMAGE_REPO =
-
-# SSHPORTALAPI_IMAGE_REPO and SSHPORTALAPI_IMAGE_TAG are an easy way to override the ssh portal api image used in the charts
-SSHPORTALAPI_IMAGE_REPO =
-SSHPORTALAPI_IMAGE_TAG =
-
-# SSHTOKEN_IMAGE_REPO and SSHTOKEN_IMAGE_TAG are an easy way to override the ssh token image used in the charts
-SSHTOKEN_IMAGE_REPO =
-SSHTOKEN_IMAGE_TAG =
-
-# SSHPORTAL_IMAGE_REPO and SSHPORTAL_IMAGE_TAG are an easy way to override the ssh portal image used in the charts
-SSHPORTAL_IMAGE_REPO =
-SSHPORTAL_IMAGE_TAG =
+# UI_IMAGE_REPO and UI_IMAGE_TAG are an easy way to override the UI image used
+# only works for installations where INSTALL_STABLE_CORE=false
+# UI_IMAGE_REPO = uselagoon/ui
+UI_IMAGE_TAG = pr-307
+
+# SSHPORTALAPI_IMAGE_REPO and SSHPORTALAPI_IMAGE_TAG are an easy way to override the ssh portal api image used in the local stack lagoon-core
+# only works for installations where INSTALL_STABLE_CORE=false
+SSHPORTALAPI_IMAGE_REPO = shreddedbacon/ssh-portal-api
+SSHPORTALAPI_IMAGE_TAG = latest
+
+# SSHTOKEN_IMAGE_REPO and SSHTOKEN_IMAGE_TAG are an easy way to override the ssh token image used in the local stack lagoon-core
+# only works for installations where INSTALL_STABLE_CORE=false
+SSHTOKEN_IMAGE_REPO = shreddedbacon/ssh-token
+SSHTOKEN_IMAGE_TAG = latest
+
+# SSHPORTAL_IMAGE_REPO and SSHPORTAL_IMAGE_TAG are an easy way to override the ssh portal image used in the local stack lagoon-remote
+# only works for installations where INSTALL_STABLE_REMOTE=false
+# SSHPORTAL_IMAGE_REPO =
+# SSHPORTAL_IMAGE_TAG =
 
 LAGOON_CORE_USE_HTTPS = true