diff --git a/Makefile b/Makefile
index 1acc8bc2..da8f9ce0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco
 
 # To update the version number in all the relevant places, update the VERSION
 # variable below and run `make update-version`.
-VERSION := 3.5
+VERSION := 3.6-alpha0
 # "alpha", "beta", or "release".
-RELEASE_CYCLE := release
+RELEASE_CYCLE := alpha
 
 # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16
 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly
diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py
index 1ac3ac4e..3666df3e 100644
--- a/addon/flamenco/__init__.py
+++ b/addon/flamenco/__init__.py
@@ -5,14 +5,14 @@
 bl_info = {
     "name": "Flamenco 3",
     "author": "Sybren A. Stüvel",
-    "version": (3, 5),
+    "version": (3, 6),
     "blender": (3, 1, 0),
     "description": "Flamenco client for Blender.",
     "location": "Output Properties > Flamenco",
     "doc_url": "https://flamenco.blender.org/",
     "category": "System",
     "support": "COMMUNITY",
-    "warning": "",
+    "warning": "This is version 3.6-alpha0 of the add-on, which is not a stable release",
 }
 
 from pathlib import Path
diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py
index efee2c7e..543f5756 100644
--- a/addon/flamenco/manager/__init__.py
+++ b/addon/flamenco/manager/__init__.py
@@ -10,7 +10,7 @@
 """
 
 
-__version__ = "3.5"
+__version__ = "3.6-alpha0"
 
 # import ApiClient
 from flamenco.manager.api_client import ApiClient
diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py
index 25c3342b..7d65fe25 100644
--- a/addon/flamenco/manager/api_client.py
+++ b/addon/flamenco/manager/api_client.py
@@ -76,7 +76,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Flamenco/3.5 (Blender add-on)'
+        self.user_agent = 'Flamenco/3.6-alpha0 (Blender add-on)'
 
     def __enter__(self):
         return self
diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py
index 3f63577f..4f6b9715 100644
--- a/addon/flamenco/manager/configuration.py
+++ b/addon/flamenco/manager/configuration.py
@@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration(
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.0.0\n"\
-               "SDK Package Version: 3.5".\
+               "SDK Package Version: 3.6-alpha0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md
index 92a13423..4208db5f 100644
--- a/addon/flamenco/manager_README.md
+++ b/addon/flamenco/manager_README.md
@@ -4,7 +4,7 @@ Render Farm manager API
 The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 1.0.0
-- Package version: 3.5
+- Package version: 3.6-alpha0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://flamenco.io/](https://flamenco.io/)
 
diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js
index 401a1a55..004f5136 100644
--- a/web/app/src/manager-api/ApiClient.js
+++ b/web/app/src/manager-api/ApiClient.js
@@ -55,7 +55,7 @@ class ApiClient {
          * @default {}
          */
         this.defaultHeaders = {
-            'User-Agent': 'Flamenco/3.5 / webbrowser'
+            'User-Agent': 'Flamenco/3.6-alpha0 / webbrowser'
         };
 
         /**