diff --git a/07_KubePrometheusStack/justfile b/07_KubePrometheusStack/justfile
index 98cc645..4d42e2e 100644
--- a/07_KubePrometheusStack/justfile
+++ b/07_KubePrometheusStack/justfile
@@ -24,15 +24,19 @@ install:
         --wait \
         -f kube-stack-config-values.yaml
 
-    echo "kubectl port-forward svc/kube-prometheus-stack-grafana 8080:80 -n ${PROMETHEUS_NAMESPACE}"
-    echo "kubectl port-forward svc/kube-prometheus-stack-prometheus 9090 -n ${PROMETHEUS_NAMESPACE}"
-    echo "kubectl port-forward svc/kube-prometheus-stack-alertmanager 9093 -n ${PROMETHEUS_NAMESPACE}"
-
-    echo "Get Grafana Password:"
-    echo "kubectl get secret --namespace monitoring -l app.kubernetes.io/component=admin-secret -o jsonpath=\"{.items[0].data.admin-password}\" | base64 --decode ; echo"
+    just KubePrometheusStack::show-ports
 
     gomplate -f ./grafana-certificate.gomplate.yaml | kubectl apply -f -
 
 
 uninstall:
-    helm uninstall kube-prometheus-stack -n ${PROMETHEUS_NAMESPACE}
\ No newline at end of file
+    helm uninstall kube-prometheus-stack -n ${PROMETHEUS_NAMESPACE}
+
+show-ports:
+    @echo "kubectl port-forward svc/kube-prometheus-stack-grafana 8080:80 -n ${PROMETHEUS_NAMESPACE}"
+    @echo "kubectl port-forward svc/kube-prometheus-stack-prometheus 9090 -n ${PROMETHEUS_NAMESPACE}"
+    @echo "kubectl port-forward svc/kube-prometheus-stack-alertmanager 9093 -n ${PROMETHEUS_NAMESPACE}"
+
+    @echo "Get Grafana Password:"
+    @echo "kubectl get secret --namespace monitoring -l app.kubernetes.io/component=admin-secret -o jsonpath=\"{.items[0].data.admin-user}\" | base64 --decode ; echo"
+    @echo "kubectl get secret --namespace monitoring -l app.kubernetes.io/component=admin-secret -o jsonpath=\"{.items[0].data.admin-password}\" | base64 --decode ; echo"