diff --git a/garden-service/src/plugins/kubernetes/container/build.ts b/garden-service/src/plugins/kubernetes/container/build.ts
index 68c164c112..360d2acd62 100644
--- a/garden-service/src/plugins/kubernetes/container/build.ts
+++ b/garden-service/src/plugins/kubernetes/container/build.ts
@@ -637,7 +637,7 @@ function isLocalHostname(hostname: string) {
 function getSocatContainer(registryHostname: string) {
   return {
     name: "proxy",
-    image: "basi/socat:v0.1.0",
+    image: "gardendev/socat:0.1.0",
     command: ["/bin/sh", "-c", `socat TCP-LISTEN:5000,fork TCP:${registryHostname}:5000 || exit 0`],
     ports: [
       {
diff --git a/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml b/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml
index 8ec8753f2e..160c55f3f3 100644
--- a/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml
+++ b/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml
@@ -65,13 +65,11 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
         - name: proxy
-          image: "basi/socat:v0.1.0"
+          image: "gardendev/socat:0.1.0"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - /bin/sh
-            - -c
-            - |
-              socat TCP-LISTEN:5000,fork TCP:{{ .Values.registry.hostname }}:5000
+          args:
+            - TCP-LISTEN:5000,fork
+            - TCP:{{ .Values.registry.hostname }}:5000
           ports:
             - name: proxy
               containerPort: 5000
diff --git a/garden-service/static/kubernetes/system/registry-proxy/values.yaml b/garden-service/static/kubernetes/system/registry-proxy/values.yaml
index 8cc38bc6e0..53ac13e825 100644
--- a/garden-service/static/kubernetes/system/registry-proxy/values.yaml
+++ b/garden-service/static/kubernetes/system/registry-proxy/values.yaml
@@ -3,8 +3,8 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: basi/socat
-  tag: v0.1.0
+  repository: envoyproxy/envoy-alpine
+  tag: v1.11.0
   pullPolicy: IfNotPresent
 
 nameOverride: garden-registry-proxy
diff --git a/images/socat/Dockerfile b/images/socat/Dockerfile
new file mode 100644
index 0000000000..10d9dfbee1
--- /dev/null
+++ b/images/socat/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:3.11.3
+
+RUN apk add --no-cache socat
+
+ENTRYPOINT ["socat"]
diff --git a/images/socat/garden.yml b/images/socat/garden.yml
new file mode 100644
index 0000000000..27d885de7a
--- /dev/null
+++ b/images/socat/garden.yml
@@ -0,0 +1,6 @@
+kind: Module
+type: container
+name: socat
+description: The socat image, used for proxy sidecars
+image: gardendev/socat:0.1.0
+dockerfile: Dockerfile