diff --git a/cmd/executor/helm/README.md b/cmd/executor/helm/README.md
index 5aad6eb1b..83692d61c 100644
--- a/cmd/executor/helm/README.md
+++ b/cmd/executor/helm/README.md
@@ -45,7 +45,7 @@ Only Slack integration is described, but described steps are the same for all co
      cacheDir: "/tmp/plugins"
      repositories:
        botkube:
-         url: http://host.k3d.internal:3000/botkube.yaml
+         url: http://host.k3d.internal:3010/botkube.yaml
 
    rbac:
      create: true
@@ -71,7 +71,7 @@ Only Slack integration is described, but described steps are the same for all co
 1. Start plugin server:
 
    ```bash
-   env PLUGIN_SERVER_HOST=http://host.k3d.internal go run test/helpers/plugin_server.go
+   env PLUGIN_SERVER_HOST=http://host.k3d.internal env PLUGIN_SERVER_PORT=3010 go run test/helpers/plugin_server.go
    ```
 
 1. Install Botkube
diff --git a/internal/executor/doctor/executor.go b/internal/executor/doctor/executor.go
index 6e4c9a8a3..b90494d73 100644
--- a/internal/executor/doctor/executor.go
+++ b/internal/executor/doctor/executor.go
@@ -50,7 +50,7 @@ func (d *Executor) Metadata(context.Context) (api.MetadataOutput, error) {
 		Description: "Doctor helps in finding the root cause of a k8s problem.",
 		JSONSchema: api.JSONSchema{
 			Value: heredoc.Doc(`{
-				  "$schema": "http://json-schema.org/draft-04/schema#",
+				  "$schema": "http://json-schema.org/draft-07/schema#",
 				  "title": "doctor",
 				  "description": "Doctor helps in finding the root cause of a k8s problem.",
 				  "type": "object",
diff --git a/test/helpers/plugin_server.go b/test/helpers/plugin_server.go
index 99b1fffc5..141ec226c 100644
--- a/test/helpers/plugin_server.go
+++ b/test/helpers/plugin_server.go
@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"github.com/kubeshop/botkube/test/fake"
 )
@@ -13,16 +14,22 @@ func main() {
 	exitOnErr(err)
 
 	host := os.Getenv("PLUGIN_SERVER_HOST")
+	port := os.Getenv("PLUGIN_SERVER_PORT")
 	if host == "" {
 		host = "http://localhost"
 	}
+	if port == "" {
+		port = "3010"
+	}
+	portInt, err := strconv.Atoi(port)
+	exitOnErr(err)
 
 	binDir := filepath.Join(dir, "plugin-dist")
 	indexEndpoint, startServerFn := fake.NewPluginServer(fake.PluginConfig{
 		BinariesDirectory: binDir,
 		Server: fake.PluginServer{
 			Host: host,
-			Port: 3000,
+			Port: portInt,
 		},
 	})