diff --git a/examples/docker-deploy/skaffold.yaml b/examples/docker-deploy/skaffold.yaml
index ab0f3f473a1..a38f66c1604 100644
--- a/examples/docker-deploy/skaffold.yaml
+++ b/examples/docker-deploy/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta22
+apiVersion: skaffold/v2beta21
 kind: Config
 build:
   local:
diff --git a/integration/diagnose_test.go b/integration/diagnose_test.go
index c0a3081dc54..fcd441da1d7 100644
--- a/integration/diagnose_test.go
+++ b/integration/diagnose_test.go
@@ -60,7 +60,9 @@ func folders(root string) ([]string, error) {
 	}
 
 	for _, f := range files {
-		folders = append(folders, f.Name())
+		if f.Mode().IsDir() {
+			folders = append(folders, f.Name())
+		}
 	}
 
 	return folders, err
diff --git a/pkg/skaffold/deploy/docker/deploy.go b/pkg/skaffold/deploy/docker/deploy.go
index b6c6e98c6ea..4e817c886eb 100644
--- a/pkg/skaffold/deploy/docker/deploy.go
+++ b/pkg/skaffold/deploy/docker/deploy.go
@@ -167,6 +167,9 @@ func (d *Deployer) deploy(ctx context.Context, out io.Writer, b graph.Artifact)
 			// skip duplication of init containers
 			continue
 		}
+		if err := d.client.Pull(ctx, out, c.Image); err != nil {
+			return errors.Wrap(err, "pulling init container image")
+		}
 		id, err := d.client.Run(ctx, out, c, dockerutil.ContainerCreateOpts{})
 		if err != nil {
 			return errors.Wrap(err, "creating container in local docker")
diff --git a/pkg/skaffold/docker/debugger/debug_test.go b/pkg/skaffold/docker/debugger/debug_test.go
index 6c09d50678f..bbbdcff8076 100644
--- a/pkg/skaffold/docker/debugger/debug_test.go
+++ b/pkg/skaffold/docker/debugger/debug_test.go
@@ -20,10 +20,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/docker/docker/api/types/container"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug/types"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
 	"github.com/GoogleContainerTools/skaffold/testutil"
-	"github.com/docker/docker/api/types/container"
 )
 
 func TestConfigurationsAndImages(t *testing.T) {