diff --git a/iotclient/iot_client.py b/iotclient/iot_client.py
index 2ad6536..858bd10 100644
--- a/iotclient/iot_client.py
+++ b/iotclient/iot_client.py
@@ -62,7 +62,7 @@ def update_image(identifier, image_path, metadata_payload):
         return False
 
     file_payload = file_encoded_b64.decode('utf-8')
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     post_url = "/image/update/" + identifier
     body = build_post_payload(identifier, metadata_payload, file_payload)
     try:
@@ -76,7 +76,7 @@ def update_image(identifier, image_path, metadata_payload):
 def get_image(identifier, version=None):
     print("Getting image with identifier " + identifier)
 
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     get_url = "/image/get/" + identifier
     if version is not None:
         get_url = get_url + "/version/"+str(version)
@@ -135,7 +135,7 @@ def get_image(identifier, version=None):
 def delete_image(identifier):
     print("Deleting image with identifier " + identifier)
 
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     get_url = "/image/delete/" + identifier
 
     try:
@@ -150,7 +150,7 @@ def delete_image(identifier):
 def delete_all_image():
     print("Deleting all images")
 
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     get_url = "/image/delete/all"
 
     try:
@@ -165,7 +165,7 @@ def delete_all_image():
 def get_all():
     print("Getting all images")
 
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     get_url = "/image/get/all"
 
     try:
@@ -179,7 +179,7 @@ def get_all():
 def check_system():
     print("Checking system health")
 
-    baseurl = "http://127.0.0.1:8000"
+    baseurl = "http://middleware:8000"
     get_url = "/check"
 
     try:
@@ -194,9 +194,9 @@ metadata = None
 index = 0
 metadata_folder = "." + os.path.sep
 metadata_file = "metadata_short" + ".json"
-metadata_path = metadata_folder + os.path.sep + metadata_file
+metadata_path = metadata_folder + metadata_file
 
-image_folder = "." + os.path.sep + "images"
+image_folder = "." + os.path.sep + "images_real"
 
 try:
     opts, args = getopt.getopt(sys.argv[1:],"hm:i:",["metadata=","imagefolder="])
@@ -218,7 +218,7 @@ if (os.path.isfile(metadata_path)):
     metadata = sorted(json.load(open(metadata_path, "r")),
                       key=lambda k: datetime.strptime(k['datetime'], '%d-%b-%Y (%H:%M:%S.%f)'))
 else:
-    print("Metadata_file '" + str(metadata_path) +  "' not found.") 
+    print("Metadata_file '" + str(metadata_path) +  "' not found.")
 
 if (os.path.isdir(image_folder)):
     print("Image folder set to " + image_folder)
@@ -422,7 +422,7 @@ while (command.lower() not in ["exit", "quit", "end"]):
             print("No image folder selected")
             continue
         delete_all_image()
-        print_cursor()        
+        print_cursor()
 
     if command.lower() == "rapid":
         t = 5