diff --git a/.env.development b/.env.development
index f798e3b1ed..60e65148e8 100644
--- a/.env.development
+++ b/.env.development
@@ -3,13 +3,14 @@ APP_ENV=development
 BACKEND_PORT=4000
 FRONTEND_PORT=4010
 
-METADATA_ENVOY_SERVICE_HOST=localhost
-METADATA_ENVOY_SERVICE_PORT=9090
-
 FASTIFY_LOG_LEVEL=debug
 
+DSPA_NAME=dspa
+METADATA_ENVOY_SERVICE_HOST=localhost
+METADATA_ENVOY_SERVICE_PORT=9090
 DS_PIPELINE_DSPA_SERVICE_HOST=localhost
 DS_PIPELINE_DSPA_SERVICE_PORT=8443
 
+TRUSTYAI_NAME=trustyai-service
 TRUSTYAI_TAIS_SERVICE_HOST=localhost
 TRUSTYAI_TAIS_SERVICE_PORT=9443
diff --git a/Makefile b/Makefile
index 920e5bda8b..f43396bbd6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ include ${DEFAULT_ENV_FILE}
 export $(shell sed 's/=.*//' ${DEFAULT_ENV_FILE})
 endif
 
+DEV_ENV_FILE := .env.development
+ifneq ("$(wildcard $(DEV_ENV_FILE))","")
+include ${DEV_ENV_FILE}
+export $(shell sed 's/=.*//' ${DEV_ENV_FILE})
+endif
+
 ENV_FILE := .env.local
 ifneq ("$(wildcard $(ENV_FILE))","")
 include ${ENV_FILE}
@@ -46,7 +52,7 @@ ifdef OC_TOKEN
 	oc login ${OC_URL} --token=${OC_TOKEN}
 else
 	$(info **** Using OC_USER and OC_PASSWORD for login ****)
-	oc login ${OC_URL} -u ${OC_USER} -p ${OC_PASSWORD} --insecure-skip-tls-verify=true
+	oc login ${OC_URL} -u ${OC_USER} -p "${OC_PASSWORD}" --insecure-skip-tls-verify=true
 endif
 
 ##################################
@@ -62,3 +68,16 @@ undeploy:
 	./install/undeploy.sh
 
 ##################################
+
+.PHONY: port-forward
+port-forward:
+ifdef NAMESPACE
+	parallel -j0 --lb ::: \
+	'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-metadata-envoy-${DSPA_NAME} ${METADATA_ENVOY_SERVICE_PORT}:9090' \
+	'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-${DSPA_NAME} ${DS_PIPELINE_DSPA_SERVICE_PORT}:8443' \
+	'oc port-forward -n ${NAMESPACE} svc/${TRUSTYAI_NAME}-tls ${TRUSTYAI_TAIS_SERVICE_PORT}:443'
+else
+	$(error Missing NAMESPACE variable)
+endif
+
+##################################