diff --git a/.gitignore b/.gitignore
index 0712f6d7..274165ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ cache*
 minio-volume
 scylladb-volume
 
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -188,3 +187,6 @@ cache
 # IntelliJ IDEA files
 .idea
 *.iml
+
+# MacOS Finder
+**/.DS_Store
\ No newline at end of file
diff --git a/benchmarks/100.webapps/120.uploader/python/function.py b/benchmarks/100.webapps/120.uploader/python/function.py
index c13656d0..1833d761 100755
--- a/benchmarks/100.webapps/120.uploader/python/function.py
+++ b/benchmarks/100.webapps/120.uploader/python/function.py
@@ -1,7 +1,6 @@
 
 import datetime
 import os
-import uuid
 
 import urllib.request
 
diff --git a/benchmarks/wrappers/gcp/nodejs/storage.js b/benchmarks/wrappers/gcp/nodejs/storage.js
index fd67a4ac..859c693a 100644
--- a/benchmarks/wrappers/gcp/nodejs/storage.js
+++ b/benchmarks/wrappers/gcp/nodejs/storage.js
@@ -20,7 +20,7 @@ class gcp_storage {
   upload(container, file, filepath) {
     let bucket = this.storage.bucket(container);
     let uniqueName = this.unique_name(file);
-    let options = {destination: uniqueName};
+    let options = {destination: uniqueName, resumable: false};
     return [uniqueName, bucket.upload(filepath, options)];
   };
 
diff --git a/config/systems.json b/config/systems.json
index 5a4077a2..5a38b496 100644
--- a/config/systems.json
+++ b/config/systems.json
@@ -196,7 +196,6 @@
       "python": {
         "base_images": {
           "x64": {
-            "3.7": "ubuntu:22.04",
             "3.8": "ubuntu:22.04",
             "3.9": "ubuntu:22.04",
             "3.10": "ubuntu:22.04",
@@ -228,10 +227,6 @@
       "nodejs": {
         "base_images": {
           "x64": {
-            "10": "ubuntu:18.04",
-            "12": "ubuntu:18.04",
-            "14": "ubuntu:18.04",
-            "16": "ubuntu:18.04",
             "18": "ubuntu:22.04",
             "20": "ubuntu:22.04"
           }
diff --git a/sebs/gcp/gcp.py b/sebs/gcp/gcp.py
index 187d8cda..eb94eca3 100644
--- a/sebs/gcp/gcp.py
+++ b/sebs/gcp/gcp.py
@@ -323,12 +323,16 @@ def create_trigger(self, function: Function, trigger_type: Trigger.TriggerType)
                 self.function_client.projects().locations().functions().get(name=full_func_name)
             )
             deployed = False
+            begin = time.time()
             while not deployed:
                 status_res = our_function_req.execute()
                 if status_res["status"] == "ACTIVE":
                     deployed = True
                 else:
                     time.sleep(3)
+                if time.time() - begin > 300:  # wait 5 minutes; TODO: make it configurable
+                    self.logging.error(f"Failed to deploy function: {function.name}")
+                    raise RuntimeError(f"Deployment timeout!")
             self.logging.info(f"Function {function.name} - deployed!")
             invoke_url = status_res["httpsTrigger"]["url"]