diff --git a/cloud/ceek_setup.py b/cloud/ceek_setup.py
index 1d7781dd..329e4aad 100644
--- a/cloud/ceek_setup.py
+++ b/cloud/ceek_setup.py
@@ -141,17 +141,18 @@ def create_inventory(options, inventory_path):
     with open(os.path.join(inventory_path, "inventory.yml"), "w") as inv:
         yaml.dump(cfgyaml, inv, sort_keys=False)
 
+    with open(os.path.join(INVENTORY_DIRECTORY, "group_vars", "all", "10-default.yml"), "r") as group_vars:
+        cfgvars = yaml.load(group_vars, Loader=yaml.FullLoader)
+
     #Add token to group_vars
     if options.git_token:
-        with open(os.path.join(INVENTORY_DIRECTORY, "group_vars", "all", "10-default.yml"), "r") as group_vars:
-            cfgvars = yaml.load(group_vars, Loader=yaml.FullLoader)
-
         cfgvars["git_repo_token"] = options.git_token
-        #Note: Calico is not supported by Azure
-        cfgvars["kubernetes_cnis"] = ["kubeovn"]
 
-        with open(os.path.join(INVENTORY_DIRECTORY, "group_vars", "all", "10-default.yml"), "w") as group_vars:
-            yaml.dump(cfgvars, group_vars, sort_keys=False)
+    #Note: Calico is not supported by Azure
+    cfgvars["kubernetes_cnis"] = ["kubeovn"]
+
+    with open(os.path.join(INVENTORY_DIRECTORY, "group_vars", "all", "10-default.yml"), "w") as group_vars:
+        yaml.dump(cfgvars, group_vars, sort_keys=False)
 
 def main(options):
     """Script entry function"""
diff --git a/inventory/default/group_vars/all/10-default.yml b/inventory/default/group_vars/all/10-default.yml
index 56b220a3..d73d7987 100644
--- a/inventory/default/group_vars/all/10-default.yml
+++ b/inventory/default/group_vars/all/10-default.yml
@@ -41,7 +41,7 @@ os_remove_yum_plugins: true
 
 ### OpenNESS Git Repository
 # Following variable specify branch/SHA/tag to be checked out for the source repository
-git_repo_branch: openness-21.03.04
+git_repo_branch: openness-21.03.05
 
 # If True, the repository will be deleted and cloned again
 # If False, repository will be left as it is and any changes won't be overwritten.
diff --git a/inventory/default/group_vars/edgenode_vca_group/10-default.yml b/inventory/default/group_vars/edgenode_vca_group/10-default.yml
index 6b0dcc03..4a4f04b2 100644
--- a/inventory/default/group_vars/edgenode_vca_group/10-default.yml
+++ b/inventory/default/group_vars/edgenode_vca_group/10-default.yml
@@ -14,5 +14,5 @@ os_remove_yum_plugins: true
 docker_images: []
 
 git_repo_url: https://{{ git_repo_token }}@github.com/open-ness/edgeservices.git
-git_repo_branch: openness-21.03.04
+git_repo_branch: openness-21.03.05
 _git_repo_dest: "{{ openness_dir }}/edgeservices"