diff --git a/delivery.yaml b/delivery.yaml
index 1866486f8..2b85d78bf 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -41,6 +41,12 @@ pipeline:
             export PATH=$PATH:$HOME/go/bin
             cd $OPERATOR_TOP_DIR/postgres-operator
             go test ./...
+        - desc: 'Run e2e tests'
+          cmd: |
+            export PATH=$PATH:$HOME/go/bin            
+            go get -u sigs.k8s.io/kind
+            cd $OPERATOR_TOP_DIR/postgres-operator
+            kind create cluster --name kind-m --config ./kind-config-multikind.yaml --loglevel debug
         - desc: 'Push docker image'
           cmd: |
             export PATH=$PATH:$HOME/go/bin
diff --git a/e2e/kind-config-multikind.yaml b/e2e/kind-config-multikind.yaml
new file mode 100644
index 000000000..d95d68b2e
--- /dev/null
+++ b/e2e/kind-config-multikind.yaml
@@ -0,0 +1,7 @@
+kind: Cluster
+apiVersion: kind.sigs.k8s.io/v1alpha3
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
+- role: worker