diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index b52564eb7ef..2d5a48dc3d8 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -59,3 +59,6 @@ RUN chmod a+rx \
         /usr/share/google/safe_format_and_mount \
         /setup-files.sh \
         /make-ca-cert.sh
+
+# Create symlinks for each hyperkube server
+RUN /hyperkube --make-symlinks