diff --git a/Makefile b/Makefile
index a78ec7224..89ecf853d 100644
--- a/Makefile
+++ b/Makefile
@@ -95,5 +95,5 @@ test:
 	hack/verify-codegen.sh
 	@go test ./...
 
-e2e:
-	cd e2e; make tools test
+e2e: docker # build operator image to be tested
+	cd e2e; make tools test clean
diff --git a/e2e/Makefile b/e2e/Makefile
index 0a4f42bae..ab19539f8 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -29,7 +29,7 @@ PATH := $(GOPATH)/bin:$(PATH)
 default: tools
 
 clean:
-	rm -fr manifests
+	rm -rf manifests
 
 copy: clean
 	mkdir manifests
@@ -44,7 +44,7 @@ push: docker
 tools: docker
 	# install pinned version of 'kind'
 	# leave the name as is to avoid overwriting official binary named `kind`
-	wget https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
+	wget https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64
 	chmod +x kind-linux-amd64
 	mv kind-linux-amd64 $(KIND_PATH)
 
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index e4a4acf73..2c600fc3e 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -3,7 +3,7 @@ kind: postgresql
 metadata:
   name: acid-test-cluster
 spec:
-  dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
+  dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
   initContainers:
   - name: date
     image: busybox
@@ -29,7 +29,7 @@ spec:
   enableShmVolume: true
 # spiloFSGroup: 103
   postgresql:
-    version: "10"
+    version: "11"
     parameters:
       shared_buffers: "32MB"
       max_connections: "10"
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 6e92c7225..9ee80016c 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -19,7 +19,7 @@ data:
   # default_cpu_request: 100m
   # default_memory_limit: 1Gi
   # default_memory_request: 100Mi
-  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
+  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
   # enable_admin_role_for_users: "true"
   # enable_database_access: "true"
   enable_master_load_balancer: "true"
diff --git a/manifests/minimal-postgres-manifest.yaml b/manifests/minimal-postgres-manifest.yaml
index e94314841..91d297cac 100644
--- a/manifests/minimal-postgres-manifest.yaml
+++ b/manifests/minimal-postgres-manifest.yaml
@@ -16,4 +16,4 @@ spec:
   databases:
     foo: zalando  # dbname: owner
   postgresql:
-    version: "10"
+    version: "11"