diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py
index 04ed39a73..612c64ca7 100644
--- a/nodepool/nodepool.py
+++ b/nodepool/nodepool.py
@@ -625,7 +625,9 @@ class NodeLauncher(threading.Thread):
             if not host:
                 raise Exception("Unable to log in via SSH")
 
-            host.ssh("test for config dir", "ls /etc/nodepool")
+            host.ssh("Create config dir", "sudo mkdir -p /etc/nodepool")
+            host.ssh("Change config dir owner",
+                     "sudo chown %s -R /etc/nodepool" % self.image.username)
 
             ftp = host.client.open_sftp()