diff --git a/kuryr_ipv6_ovn.conf b/kuryr_ipv6_ovn.conf
index 68f3929..41b5209 100644
--- a/kuryr_ipv6_ovn.conf
+++ b/kuryr_ipv6_ovn.conf
@@ -1,54 +1,38 @@
 [[local|localrc]]
 
-enable_plugin kuryr-kubernetes \
-    https://opendev.org/openstack/kuryr-kubernetes
-
+# USE_PYTHON3=True
 KURYR_IPV6=True
+# Q_PLUGIN_CONF_FILE=/etc/neutron/plugins/ml2/ml2_conf.ini
 
-LOGFILE=devstack.log
+enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes
+
+# If you do not want stacking to clone new versions of the enabled services,
+# like for example when you did local modifications and need to ./unstack.sh
+# and ./stack.sh again, uncomment the following
+RECLONE="no"
+
+# Log settings for better readability
 LOG_COLOR=False
-#USE_PYTHON3=True
-FORCE=yes
+LOGFILE=devstack.log
 
 
 # Credentials
-ADMIN_PASSWORD=pass
-DATABASE_PASSWORD=pass
-RABBIT_PASSWORD=pass
-SERVICE_PASSWORD=pass
-SERVICE_TOKEN=pass
+ADMIN_PASSWORD=password
+DATABASE_PASSWORD=password
+RABBIT_PASSWORD=password
+SERVICE_PASSWORD=password
+SERVICE_TOKEN=password
 # Enable Keystone v3
 IDENTITY_API_VERSION=3
 
+# In pro of speed and being lightweight, we will be explicit in regards to
+# which services we enable
 ENABLED_SERVICES=""
 
-# OVN components
-enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
-enable_service ovn-northd
-enable_service ovn-controller
-enable_service networking-ovn-metadata-agent
-
-
-Q_USE_PROVIDERNET_FOR_PUBLIC=True
-OVS_PHYSICAL_BRIDGE=br-ex
-PUBLIC_BRIDGE=br-ex
-OVS_BRIDGE_MAPPINGS=public:br-ex
 
 # Neutron services
-enable_service neutron
-enable_service q-svc
-
-# VAR RUN PATH
-# =============
-VAR_RUN_PATH=/usr/local/var/run
-
-# Kuryr K8S-Endpoint driver Octavia provider
-# ==========================================
-KURYR_EP_DRIVER_OCTAVIA_PROVIDER=ovn
-KURYR_K8S_OCTAVIA_MEMBER_MODE=L2
-KURYR_K8S_OCTAVIA_SG_MODE=create
-KURYR_ENFORCE_SG_RULES=False
-KURYR_LB_ALGORITHM=SOURCE_IP_PORT
+#enable_service neutron
+#enable_service q-svc
 
 # Octavia LBaaSv2
 LIBS_FROM_GIT+=python-octaviaclient
@@ -82,17 +66,31 @@ enable_service key
 # dependencies
 enable_service mysql
 enable_service rabbit
-
-enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
 enable_service etcd3
+
+# By default use all the services from the kuryr-kubernetes plugin
+
+# Docker
+# ======
+# If you already have docker configured, running and with its socket writable
+# by the stack user, you can omit the following line.
+enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
+
+enable_service kuryr-kubernetes
+
+enable_service kuryr-daemon
+
+KURYR_K8S_CONTAINERIZED_DEPLOYMENT=False
+
+IMAGE_URLS+=",http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
+
 enable_service kubernetes-api
 enable_service kubernetes-controller-manager
 enable_service kubernetes-scheduler
 
 enable_service kubelet
-enable_service kuryr-kubernetes
-enable_service kuryr-daemon
-KURYR_K8S_CONTAINERIZED_DEPLOYMENT=True
+
+# OpenShift
 # KURYR_POD_VIF_DRIVER=neutron-vif
 KURYR_ENABLED_HANDLERS=vif,lb,lbaasspec,namespace,pod_label,policy,kuryrnetpolicy,kuryrnet
 KURYR_SG_DRIVER=policy
@@ -100,10 +98,35 @@ KURYR_SUBNET_DRIVER=namespace
 
 KURYR_NEUTRON_DEFAULT_ROUTER=kuryr-router
 
-enable_plugin kuryr-tempest-plugin https://github.com/openstack/kuryr-tempest-plugin.git
+# Tempest
 enable_service tempest
+enable_plugin kuryr-tempest-plugin https://github.com/openstack/kuryr-tempest-plugin.git
+
+
+
+
+
+# Octavia
+
+# Kuryr K8S-Endpoint driver Octavia provider
+# ==========================================
+KURYR_EP_DRIVER_OCTAVIA_PROVIDER=ovn
+KURYR_K8S_OCTAVIA_MEMBER_MODE=L2
+KURYR_K8S_OCTAVIA_SG_MODE=create
+KURYR_ENFORCE_SG_RULES=False
+KURYR_LB_ALGORITHM=SOURCE_IP_PORT
+
+# OVN
+enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
+enable_service ovn-northd
+enable_service ovn-controller
+enable_service networking-ovn-metadata-agent
+VAR_RUN_PATH=/usr/local/var/run
+Q_USE_PROVIDERNET_FOR_PUBLIC=True
+OVS_PHYSICAL_BRIDGE=br-ex
+PUBLIC_BRIDGE=br-ex
+OVS_BRIDGE_MAPPINGS=public:br-ex
 
-IMAGE_URLS+=",http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
 
 [[post-config|$OCTAVIA_CONF]]
 [controller_worker]