diff --git a/imager/image.py b/imager/image.py
index f5e20f7..19fd496 100755
--- a/imager/image.py
+++ b/imager/image.py
@@ -9,7 +9,7 @@ import tempfile
 import time
 
 
-parser = argparse.ArgumentParser(description='iconograph build_image')
+parser = argparse.ArgumentParser(description='iconograph image')
 parser.add_argument(
     '--base-url',
     dest='base_url',
diff --git a/imager/wait_for_service.py b/imager/wait_for_service.py
new file mode 100755
index 0000000..896dbcc
--- /dev/null
+++ b/imager/wait_for_service.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+
+import argparse
+import socket
+import time
+
+
+parser = argparse.ArgumentParser(description='iconograph wait_for_service')
+parser.add_argument(
+    '--host',
+    dest='host',
+    action='store',
+    required=True)
+parser.add_argument(
+    '--service',
+    dest='service',
+    action='store',
+    required=True)
+FLAGS = parser.parse_args()
+
+
+def main():
+  conn = (FLAGS.host, FLAGS.service)
+  print('Trying to connect to %s:%s' % conn)
+  while True:
+    try:
+      socket.create_connection(conn, timeout=5)
+      break
+    except Exception:
+      time.sleep(1)
+      continue
+  print('Connection successful')
+
+
+if __name__ == '__main__':
+  main()