diff --git a/demo1-getting-started.py b/demo1-getting-started.py
index 997bff6cafad51baf07ec266233e3279b6fd5c72..30307143b68d915a0c01aff9457db5d4db52040f 100644
--- a/demo1-getting-started.py
+++ b/demo1-getting-started.py
@@ -33,6 +33,7 @@ project_network = 'CloudComp' + str(group_number) + '-net'
 
 # The image to look for and use for the started instance
 ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
+# TODO: Ubuntu >18.04 would require major updates to faafo example again/better option: complete rewrite of example?
 
 # default region
 region_name = 'RegionOne'
diff --git a/demo3-microservice.py b/demo3-microservice.py
index 0139106f3fa29f5e9e7c01d3c812426f4996d7bc..4c1a5adbd32446efc44e6848a6d9d592b2fc86c9 100644
--- a/demo3-microservice.py
+++ b/demo3-microservice.py
@@ -25,6 +25,7 @@ project_network = 'CloudComp' + str(group_number) + '-net'
 
 # The image to look for and use for the started instance
 ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
+# TODO: Ubuntu >18.04 would require major updates to faafo example again/better option: complete rewrite of example?
 
 # The public key to be used for SSH connection, please make sure, that you have the corresponding private key
 #
diff --git a/demo4-scale-out-add-worker.py b/demo4-scale-out-add-worker.py
index 95af385a3d7ff3048256981f2434e8c9f5d9a657..14b40b1544cf5d5c311e111d3f02d3311b588c71 100644
--- a/demo4-scale-out-add-worker.py
+++ b/demo4-scale-out-add-worker.py
@@ -27,6 +27,7 @@ project_network = 'CloudComp' + str(group_number) + '-net'
 
 # The image to look for and use for the started instance
 ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
+# TODO: Ubuntu >18.04 would require major updates to faafo example again/better option: complete rewrite of example?
 
 # The public key to be used for SSH connection, please make sure, that you have the corresponding private key
 #
diff --git a/demo4-scale-out.py b/demo4-scale-out.py
index f194c0a2ea428443528c60f9e355035982ab6f34..86e1a24becc6f30ff731ab35a0c13d10d24d1c78 100644
--- a/demo4-scale-out.py
+++ b/demo4-scale-out.py
@@ -27,6 +27,7 @@ project_network = 'CloudComp' + str(group_number) + '-net'
 
 # The image to look for and use for the started instance
 ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
+# TODO: Ubuntu >18.04 would require major updates to faafo example again/better option: complete rewrite of example?
 
 # The public key to be used for SSH connection, please make sure, that you have the corresponding private key
 #