diff --git a/delivery.yaml b/delivery.yaml
index 3096c4b47..e7cceae3e 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -2,7 +2,9 @@ version: "2017-09-20"
 pipeline:
     - id: build-postgres-operator
       type: script
-      vm: large
+      vm_config:
+        type: linux
+        size: large
       cache:
         paths:
           - /go/pkg/mod
@@ -37,9 +39,6 @@ pipeline:
           cmd: |
             export PATH=$PATH:$HOME/go/bin
             go test ./...
-        - desc: 'Run e2e tests'
-          cmd: |
-            make e2e
         - desc: 'Push docker image'
           cmd: |
             export PATH=$PATH:$HOME/go/bin
@@ -55,6 +54,8 @@ pipeline:
 
     - id: build-operator-ui
       type: script
+      vm_config:
+        type: linux
 
       commands:
         - desc: 'Prepare environment'
@@ -83,6 +84,8 @@ pipeline:
 
     - id: build-logical-backup
       type: script
+      vm_config:
+        type: linux
 
       commands:
         - desc: Build image