diff --git a/Makefile b/Makefile
index a07db746..9e3f0bc9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,17 @@ 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 = 
+# UI_IMAGE_TAG = latest
 
 # 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 = 
-SSHPORTALAPI_IMAGE_TAG = 
+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 = 
-SSHTOKEN_IMAGE_TAG = 
+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