diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c847d8782..7ee930b36 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -151,7 +151,7 @@ For faster development, you can also build and run Botkube outside K8s cluster.
    export BOTKUBE_PLUGINS_CACHE__DIR="/tmp/plugins"
    ```
 
-3. Each time you make a change to [source](cmd/source) or [executors](cmd/executor) plugins, run:
+3. In other terminal window, run:
 
    ```bash
    # rebuild plugins only for current GOOS and GOARCH
@@ -162,6 +162,9 @@ For faster development, you can also build and run Botkube outside K8s cluster.
    ./botkube
    ```
 
+   > **Note**
+   > Each time you make a change to the [source](cmd/source) or [executors](cmd/executor) plugins re-run the above command.
+
 ## Making A Change
 
 - Before making any significant changes, please [open an issue](https://github.com/kubeshop/botkube/issues). Discussing your proposed changes ahead of time will make the contribution process smooth for everyone.
diff --git a/cmd/executor/echo/README.md b/cmd/executor/echo/README.md
index 02b215bc7..96ee1edea 100644
--- a/cmd/executor/echo/README.md
+++ b/cmd/executor/echo/README.md
@@ -4,7 +4,7 @@ Echo is the example Botkube executor used during [e2e tests](../../../test/e2e).
 
 ## Configuration parameters
 
-The Echo configuration should be specified in YAML format. It accepts such parameters:
+The configuration should be specified in YAML format. Such parameters are supported:
 
 ```yaml
 changeResponseToUpperCase: true # default is 'false'.
diff --git a/cmd/executor/echo/main.go b/cmd/executor/echo/main.go
index fb0cce976..c948d7858 100644
--- a/cmd/executor/echo/main.go
+++ b/cmd/executor/echo/main.go
@@ -30,7 +30,7 @@ func (EchoExecutor) Execute(_ context.Context, req *executor.ExecuteRequest) (*e
 	}
 
 	return &executor.ExecuteResponse{
-		Data: data + "v2",
+		Data: data,
 	}, nil
 }
 
diff --git a/cmd/source/cm-watcher/README.md b/cmd/source/cm-watcher/README.md
index 3021b81c8..035a55c35 100644
--- a/cmd/source/cm-watcher/README.md
+++ b/cmd/source/cm-watcher/README.md
@@ -1,11 +1,13 @@
-# Echo executor
+# ConfigMap watcher source
 
-Echo is the example Botkube executor used during [e2e tests](../../../test/e2e).
+ConfigMap watcher source is the example Botkube source used during [e2e tests](../../../test/e2e).
 
 ## Configuration parameters
 
-The Echo configuration should be specified in YAML format. It accepts such parameters:
+The configuration should be specified in YAML format. Such parameters are supported:
 
 ```yaml
-configMapName: cm-map-watcher # config map name to react to.
+configMap:
+  name: cm-map-watcher # config map name to react to
+  namespace: botkube  # config map namespace
 ```
diff --git a/cmd/source/cm-watcher/main.go b/cmd/source/cm-watcher/main.go
index 0d414a58e..b97895d0a 100644
--- a/cmd/source/cm-watcher/main.go
+++ b/cmd/source/cm-watcher/main.go
@@ -2,10 +2,22 @@ package main
 
 import (
 	"context"
-	"encoding/json"
-	"time"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
 
 	"github.com/hashicorp/go-plugin"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/clientcmd"
+
+	watchtools "k8s.io/client-go/tools/watch"
 
 	"github.com/kubeshop/botkube/pkg/api/source"
 )
@@ -13,9 +25,15 @@ import (
 const pluginName = "cm-watcher"
 
 // Config holds executor configuration.
-type Config struct {
-	ConfigMapName string
-}
+type (
+	Config struct {
+		ConfigMap Object
+	}
+	Object struct {
+		Name      string `yaml:"name"`
+		Namespace string `yaml:"namespace"`
+	}
+)
 
 // CMWatcher implements Botkube source plugin.
 type CMWatcher struct{}
@@ -24,29 +42,65 @@ type CMWatcher struct{}
 func (CMWatcher) Stream(ctx context.Context) (source.StreamOutput, error) {
 	// TODO: in request we should receive the executor configuration.
 	cfg := Config{
-		ConfigMapName: "cm-watcher-trigger",
+		ConfigMap: Object{
+			Name:      "cm-watcher-trigger",
+			Namespace: "botkube",
+		},
 	}
 
-	raw, err := json.Marshal(cfg)
-	if err != nil {
-		return source.StreamOutput{}, err
-	}
 	out := source.StreamOutput{
 		Output: make(chan []byte),
 	}
 
-	go func() {
-		for {
-			select {
-			case <-time.Tick(1 * time.Second):
-				out.Output <- raw
-			case <-ctx.Done():
+	go listenEvents(ctx, cfg.ConfigMap, out.Output)
+
+	return out, nil
+}
+
+func listenEvents(ctx context.Context, obj Object, sink chan<- []byte) {
+	home, err := os.UserHomeDir()
+	exitOnError(err)
+
+	config, err := clientcmd.BuildConfigFromFlags("", filepath.Join(home, ".kube", "config"))
+	exitOnError(err)
+	clientset, err := kubernetes.NewForConfig(config)
+	exitOnError(err)
+
+	fieldSelector := fields.OneTermEqualSelector("metadata.name", obj.Name).String()
+	lw := &cache.ListWatch{
+		ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
+			options.FieldSelector = fieldSelector
+			return clientset.CoreV1().Pods(obj.Namespace).List(ctx, options)
+		},
+		WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
+			options.FieldSelector = fieldSelector
+			return clientset.CoreV1().Pods(obj.Namespace).Watch(ctx, options)
+		},
+	}
+
+	fmt.Println("starting informer")
+	_, informer, watcher, _ := watchtools.NewIndexerInformerWatcher(lw, &corev1.ConfigMap{})
+	defer watcher.Stop()
+
+	fmt.Println("waiting for cache sync")
+	cache.WaitForCacheSync(ctx.Done(), informer.HasSynced)
+
+	ch := watcher.ResultChan()
+	defer watcher.Stop()
+
+	for {
+		select {
+		case event, ok := <-ch:
+			fmt.Println("get event", event)
+			if !ok { // finished
 				return
 			}
+			cm := event.Object.(*corev1.ConfigMap)
+			sink <- []byte(cm.Name)
+		case <-ctx.Done(): // client closed streaming
+			return
 		}
-	}()
-
-	return out, nil
+	}
 }
 
 func main() {
@@ -56,3 +110,9 @@ func main() {
 		},
 	})
 }
+
+func exitOnError(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}