diff --git a/examples/devstack-fedora34.yaml b/examples/devstack-fedora36.yaml
similarity index 58%
rename from examples/devstack-fedora34.yaml
rename to examples/devstack-fedora36.yaml
index 8b0a59f..bf32e82 100644
--- a/examples/devstack-fedora34.yaml
+++ b/examples/devstack-fedora36.yaml
@@ -1,9 +1,7 @@
-# Note, that cloud init will fail, due to old cloudinit package, which module
-# cc_keys_to_console doesn't recognize skipping option. Just ignore this error.
 package_update: true
 packages:
   - bash-completion
-  - ctags-etags
+  - ctags
   - git
   - git-review
   - htop
@@ -25,13 +23,13 @@ write_files:
       disable_service n-vnc
       disable_service dstat
 runcmd:
-  - [su, -, fedora, -c, "git clone https://opendev.org/openstack/devstack ~/devstack"]
-  - [su, -, fedora, -c, "cp /tmp/local.conf /home/fedora/devstack/"]
-  - [su, -, fedora, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
+  - su - fedora -c "git clone https://opendev.org/openstack/devstack ~/devstack"
+  - su - fedora -c "cp /tmp/local.conf /home/fedora/devstack/"
+  - su - fedora -c "echo 'export HOST_IP=10.0.2.15' >> .bashrc"
 boxpy_data:
   key: vm
   cpus: 2
   memory: 4GB
   disk_size: 10GB
   distro: fedora
-  version: 34
+  version: 36