diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..80c3d8ee
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Setup (please complete the following information):**
+ - OS: [e.g. Ubuntu 22.04]
+ - Cloud Location [e.g. Bielefeld]
+ - Configuration
+ - BiBiGrid Version
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..11fc491e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/bibigrid/core/startup.py b/bibigrid/core/startup.py
index 25001ab7..2442292b 100755
--- a/bibigrid/core/startup.py
+++ b/bibigrid/core/startup.py
@@ -104,7 +104,7 @@ def run_action(args, configurations, config_path):
                         exit_state = ide.ide(args.cluster_id, providers[0], configurations[0], LOG)
                     elif args.update:
                         LOG.info("Action update selected")
-                        exit_state = update.update(args.cluster_id, providers[0], configurations[0])
+                        exit_state = update.update(args.cluster_id, providers[0], configurations[0], LOG)
             for provider in providers:
                 provider.close()
         else:
diff --git a/bibigrid/core/utility/validate_configuration.py b/bibigrid/core/utility/validate_configuration.py
index 0da48d84..cca9b113 100644
--- a/bibigrid/core/utility/validate_configuration.py
+++ b/bibigrid/core/utility/validate_configuration.py
@@ -317,6 +317,7 @@ def check_instance_type_image_combination(self, instance_type, instance_image, p
             self.log.warning(f"Flavor {instance_type} does not exist on {provider.cloud_specification['identifier']}.\n"
                              f"Available flavors:\n{available_flavors}")
             return False
+
         type_max_disk_space = flavor["disk"]
         type_max_ram = flavor["ram"]
         image_min_disk_space = provider.get_image_by_id_or_name(instance_image)["min_disk"]
@@ -389,12 +390,8 @@ def check_network(self):
                         f"Subnet '{subnet_name_or_id}' not found on {provider.cloud_specification['identifier']}")
                     success = False
                 else:
-                    self.log.info(f"Subnet '{subnet_name_or_id}' found on {provider.cloud_specification['identifier']}")
-            else:
-                self.log.warning(f"Neither 'network' nor 'subnet' defined in configuration on "
-                                 f"{provider.cloud_specification['identifier']}.")
-                success = False
-        return success
+                    self.log.info(f"Subnet '{subnet_name_or_id}' found")
+        return bool(success and (network_name_or_id or subnet_name_or_id))
 
     def check_server_group(self):
         """
@@ -471,7 +468,6 @@ def check_nfs(self):
         @return: True
         """
         self.log.info("Checking nfs...")
-        success = True
         master_configuration = self.configurations[0]
         nfs_shares = master_configuration.get("nfsShares")
         nfs = master_configuration.get("nfs")