diff --git a/.clang-format b/.clang-format
index ddcb517..603c00c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,7 @@
 ---
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: AcrossComments
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -24,7 +24,9 @@ AttributeMacros:
   - __packed
   - __printf_like
   - __syscall
+  - __syscall_always_inline
   - __subsystem
+BitFieldColonSpacing: After
 BreakBeforeBraces: Linux
 ColumnLimit: 100
 ConstructorInitializerIndentWidth: 8
@@ -63,7 +65,12 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
-IncludeBlocks: Regroup
+  - 'STRUCT_SECTION_FOREACH'
+  - 'TYPE_SECTION_FOREACH'
+IfMacros:
+  - 'CHECKIF'
+# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
+#IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^".*\.h"$'
     Priority: 0
@@ -75,8 +82,10 @@ IncludeCategories:
     Priority: 3
 IndentCaseLabels: false
 IndentWidth: 8
-# SpaceBeforeParens: ControlStatementsExceptControlMacros # clang-format >= 13.0
-UseTab: Always
+InsertBraces: true
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SortIncludes: Never
+UseTab: ForContinuationAndIndentation
 WhitespaceSensitiveMacros:
   - STRINGIFY
   - Z_STRINGIFY
diff --git a/application/src/main.c b/application/src/main.c
index f0fa209..6f6bf79 100644
--- a/application/src/main.c
+++ b/application/src/main.c
@@ -3,7 +3,9 @@
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
 
-void main(void)
+int main(void)
 {
 	LOG_INF("Build time: " __DATE__ " " __TIME__);
+
+	return 0;
 }
diff --git a/west.yml b/west.yml
index 626cafa..a752d18 100644
--- a/west.yml
+++ b/west.yml
@@ -1,11 +1,11 @@
 manifest:
   version: "0.12"
   remotes:
-    - name: hardwario-chester
-      url-base: git@gitlab.hardwario.com:chester
+    - name: hardwario
+      url-base: https://github.com/hardwario
   projects:
-    - name: sdk.git
-      remote: hardwario-chester
+    - name: chester-sdk.git
+      remote: hardwario
       revision: main
       path: chester
       import: true