diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df140d4..4157d30 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,32 +14,32 @@ jobs:
         include:
           - identifier: linux-debug
             name: Linux Debug
-            runner: ubuntu-18.04
-            target: debug
+            runner: ubuntu-20.04
+            target: template_debug
             platform: linux
             arch: x86_64
           - identifier: linux-release
             name: Linux Release
-            runner: ubuntu-18.04
-            target: release
+            runner: ubuntu-20.04
+            target: template_release
             platform: linux
             arch: x86_64
           - identifier: windows-debug
             name: Windows Debug
             runner: ubuntu-20.04
-            target: debug
+            target: template_debug
             platform: windows
             arch: x86_64
           - identifier: windows-release
             name: Windows Release
             runner: ubuntu-20.04
-            target: release
+            target: template_release
             platform: windows
             arch: x86_64
           - identifier: android-release
             name: Android Release
             runner: ubuntu-20.04
-            target: release
+            target: template_release
             platform: android
             arch: arm64
 
diff --git a/SConstruct b/SConstruct
index 3709ffd..8222b88 100644
--- a/SConstruct
+++ b/SConstruct
@@ -25,13 +25,14 @@ project_name = Path(extension_path).stem
 #     print("Scons cache enabled... (path: '" + scons_cache_path + "')")
 
 # Create the library target (e.g. libexample.linux.debug.x86_64.so).
+debug_or_release = "release" if env["target"] == "template_release" else "debug"
 if env["platform"] == "macos":
     library = env.SharedLibrary(
         "{0}/bin/lib{1}.{2}.{3}.framework/{1}.{2}.{3}".format(
             addon_path,
             project_name,
             env["platform"],
-            env["target"],
+            debug_or_release,
         ),
         source=sources,
     )
@@ -41,8 +42,8 @@ else:
             addon_path,
             project_name,
             env["platform"],
-            env["target"],
-            env["arch_suffix"],
+            debug_or_release,
+            env["arch"],
             env["SHLIBSUFFIX"],
         ),
         source=sources,
diff --git a/godot-cpp b/godot-cpp
index 8670305..adf4802 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 86703055894cb2555f0ec704eff11e3c1c81a5d3
+Subproject commit adf4802f4bd7fb7cafc1e94882df3f105d7f7afd
diff --git a/project/project.godot b/project/project.godot
index 1722be7..d985627 100644
--- a/project/project.godot
+++ b/project/project.godot
@@ -12,4 +12,4 @@ config_version=5
 
 config/name="example"
 run/main_scene="res://demo/demo.tscn"
-config/features=PackedStringArray("4.0", "Vulkan Clustered")
+config/features=PackedStringArray("4.0")