diff --git a/e2e/addon/mock/vela_addon_mock_server.go b/e2e/addon/mock/vela_addon_mock_server.go
index 0bcc2a886..96a350708 100644
--- a/e2e/addon/mock/vela_addon_mock_server.go
+++ b/e2e/addon/mock/vela_addon_mock_server.go
@@ -20,6 +20,7 @@ import (
 	"embed"
 	"encoding/xml"
 	"fmt"
+	"html/template"
 	"io/fs"
 	"log"
 	"net/http"
@@ -67,25 +68,37 @@ var ossHandler http.HandlerFunc = func(rw http.ResponseWriter, req *http.Request
 			}
 		}
 		data, err := xml.Marshal(res)
+		error := map[string]error{"error": err}
+		// Make and parse the data
+		t, err := template.New("").Parse(string(data))
 		if err != nil {
-			_, _ = rw.Write([]byte(err.Error()))
+			// Render the data
+			t.Execute(rw, error)
 		}
-		_, _ = rw.Write(data)
+		// Render the data
+		t.Execute(rw, data)
+
 	} else {
 		found := false
 		for _, p := range paths {
 			if queryPath == p.path {
 				file, err := testData.ReadFile(path.Join("testdata", queryPath))
+				error := map[string]error{"error": err}
+				// Make and parse the data
+				t, err := template.New("").Parse(string(file))
 				if err != nil {
-					_, _ = rw.Write([]byte(err.Error()))
+					// Render the data
+					t.Execute(rw, error)
 				}
 				found = true
-				_, _ = rw.Write(file)
+				t.Execute(rw, file)
 				break
 			}
 		}
 		if !found {
-			_, _ = rw.Write([]byte("not found"))
+			nf := "not found"
+			t, _ := template.New("").Parse(nf)
+			t.Execute(rw, nf)
 		}
 	}
 }
diff --git a/references/cli/portforward.go b/references/cli/portforward.go
index d6ae8b994..031977e8e 100644
--- a/references/cli/portforward.go
+++ b/references/cli/portforward.go
@@ -19,6 +19,7 @@ package cli
 import (
 	"context"
 	"fmt"
+	"net"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -272,7 +273,7 @@ func (o *VelaPortForwardOptions) Complete() error {
 		case "443":
 			val = "8443:443"
 		default:
-			val = fmt.Sprintf("%s:%s", port, port)
+			val = net.JoinHostPort(port, port)
 		}
 		o.Args[0] = fmt.Sprintf("svc/%s", svcName)
 		o.Args = append(o.Args, val)