diff --git a/Makefile b/Makefile
index 80ca5bcc..949047ea 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CLANG_TIDY_BUILD_DIR=build-clang-tidy
 CLANG_TIDY_COMPILE_COMMANDS_FILE=$(CLANG_TIDY_BUILD_DIR)/compile_commands.json
 CLANG_TIDY_BINDINGS_FILE=$(CLANG_TIDY_BUILD_DIR)/godot-cpp/gen/include/godot_cpp/classes/node.hpp
 LIBMASZYNA_DEBUG:=""
-CMAKE_GODOTCPP_API_VERSION=4.6
+CMAKE_GODOTCPP_API_VERSION=4.7
 
 #Helper for CLion so it would see generated bindings
 generate-bindings:
diff --git a/README.md b/README.md
index c4494203..f1eb7bce 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ least two cores.
 | 30.09.2025     | 4.5                  | ✅       | ✅     | ❌      | ✅ (Target API Level: 34) | ❌   | C++ 17       | 24.06               |
 | 30.11.2025     | 4.5.x                | ✅       | ✅     | ❌      | ✅ (Target API Level: 34) | ❌   | C++ 17       | 24.06, 25.11        |
 | 27.01.2026     | 4.6                  | ✅       | ✅     | ❌      | ✅ (Target API Level: 34) | ❌   | C++ 17       | 24.06, 25.11, 26.01 |
+| 06.07.2026     | 4.7.x                | ✅       | ✅     | ❌      | ✅ (Target API Level: 34) | ❌   | C++ 17       | 24.06, 25.11, 26.01 |
 ### Documentation 
 
 Project documentation: https://maszyna-reloaded.github.io/MaSzyna-API-wrapper/
diff --git a/demo/project.godot b/demo/project.godot
index 2b78f4c0..e6bf6bc9 100644
--- a/demo/project.godot
+++ b/demo/project.godot
@@ -18,7 +18,7 @@ config/name="MaSzyna Reloaded"
 config/description="A port of MaSzyna Train Simulator"
 run/main_scene="uid://1djubq5jy2wx"
 run/print_header=false
-config/features=PackedStringArray("4.6", "Forward Plus")
+config/features=PackedStringArray("4.7", "Forward Plus")
 boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/show_image=false
 boot_splash/image="res://splash.png"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0ca5ef6b..4371c6a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   unit_tests:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable
+    image: jezsonic/build-tools:4.7.stable
     container_name: unit_tests
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -t template_debug -u true
     volumes:
@@ -12,7 +12,7 @@ services:
   windows_x86_64:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable
+    image: jezsonic/build-tools:4.7.stable
     container_name: windows_x86_64
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p windows -a x86_64 -t $TARGET
     volumes:
@@ -22,7 +22,7 @@ services:
   windows_x86_32:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable
+    image: jezsonic/build-tools:4.7.stable
     container_name: windows_x86_32
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p windows -a x86_32 -t $TARGET
     volumes:
@@ -32,7 +32,7 @@ services:
   linux_x86_64:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable
+    image: jezsonic/build-tools:4.7.stable
     container_name: linux_x86_64
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p linux -a x86_64 -t $TARGET
     volumes:
@@ -42,7 +42,7 @@ services:
   linux_x86_32:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable
+    image: jezsonic/build-tools:4.7.stable
     container_name: linux_x86_32
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p linux -a x86_32 -t $TARGET
     volumes:
@@ -52,7 +52,7 @@ services:
   android_x86_64:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable.android
+    image: jezsonic/build-tools:4.7.stable.android
     container_name: android_x86_64
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a x86_64 -t $TARGET
     volumes:
@@ -62,7 +62,7 @@ services:
   android_x86_32:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable.android
+    image: jezsonic/build-tools:4.7.stable.android
     container_name: android_x86_32
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a x86_32 -t $TARGET
     volumes:
@@ -72,7 +72,7 @@ services:
   android_arm64:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable.android
+    image: jezsonic/build-tools:4.7.stable.android
     container_name: android_arm64
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a arm64 -t $TARGET
     volumes:
@@ -82,7 +82,7 @@ services:
   android_arm32:
     environment:
       - ${TARGET:-template_debug}
-    image: jezsonic/build-tools:4.6.stable.android
+    image: jezsonic/build-tools:4.7.stable.android
     container_name: android_arm32
     entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a arm32 -t $TARGET
     volumes:
diff --git a/godot-cpp b/godot-cpp
index 9e0650a0..ba0edfed 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 9e0650a0ae806367854d50342c4751690a09d521
+Subproject commit ba0edfed90512ec64aba51d4295a3e7e30112f86
diff --git a/vendor/gut b/vendor/gut
index 9f3edeb1..e9e31f12 160000
--- a/vendor/gut
+++ b/vendor/gut
@@ -1 +1 @@
-Subproject commit 9f3edeb19df664ad32c369353d8d62dbb7b80673
+Subproject commit e9e31f122b65b516accbb16e02f0868ddab67d17