diff --git a/.clang-format b/.clang-format
index dd47a7309e..f0202bc7ec 100644
--- a/.clang-format
+++ b/.clang-format
@@ -53,7 +53,7 @@ IncludeCategories:
   - Regex: '.*'
     Priority: 4
 IndentCaseLabels: true
-IndentGotoLabels: true
+IndentGotoLabels: false
 IndentPPDirectives: None
 IndentWidth: 2
 IndentWrappedFunctionNames: false
diff --git a/jerry-core/ecma/base/ecma-module.c b/jerry-core/ecma/base/ecma-module.c
index fdff90310e..3a3624a406 100644
--- a/jerry-core/ecma/base/ecma-module.c
+++ b/jerry-core/ecma/base/ecma-module.c
@@ -521,7 +521,7 @@ ecma_module_resolve_export (ecma_module_t *const module_p, /**< base module */
       star_export_p = star_export_p->next_p;
     }
 
-  next_iteration:
+next_iteration:
     current_set_p = current_set_p->next_p;
   } while (current_set_p != NULL);
 
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
index 70cad8986e..211d5f1764 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
@@ -668,7 +668,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar
 
     ret_value = ECMA_VALUE_EMPTY;
 
-  clean_up:
+clean_up:
     ecma_free_value (upper_value);
     ecma_free_value (lower_value);
     ecma_deref_ecma_string (lower_str_p);
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c
index 469ad114b6..59abb4481b 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c
@@ -254,7 +254,7 @@ ecma_builtin_array_object_from (ecma_value_t this_arg, /**< 'this' argument */
       k++;
     }
 
-  iterator_cleanup:
+iterator_cleanup:
     ecma_free_value (iterator);
     ecma_free_value (next_method);
     ecma_deref_object (array_obj_p);
diff --git a/jerry-core/ecma/operations/ecma-regexp-object.c b/jerry-core/ecma/operations/ecma-regexp-object.c
index a392b141e5..481aafba7b 100644
--- a/jerry-core/ecma/operations/ecma-regexp-object.c
+++ b/jerry-core/ecma/operations/ecma-regexp-object.c
@@ -1483,7 +1483,7 @@ ecma_regexp_run (ecma_regexp_ctx_t *re_ctx_p, /**< RegExp matcher context */
 
         goto fail;
 
-      class_found:
+class_found:
         if (flags & RE_CLASS_INVERT)
         {
           goto fail;
@@ -1565,7 +1565,7 @@ ecma_regexp_run (ecma_regexp_ctx_t *re_ctx_p, /**< RegExp matcher context */
     }
 
     JERRY_UNREACHABLE ();
-  fail:
+fail:
     bc_p = next_alternative_p;
 
     if (bc_p == NULL || *bc_p++ != RE_OP_ALTERNATIVE_NEXT)
diff --git a/jerry-core/parser/js/js-parser-expr.c b/jerry-core/parser/js/js-parser-expr.c
index 9250fa572c..bb22e43fac 100644
--- a/jerry-core/parser/js/js-parser-expr.c
+++ b/jerry-core/parser/js/js-parser-expr.c
@@ -3957,7 +3957,7 @@ parser_parse_expression (parser_context_t *context_p, /**< context */
 
     while (true)
     {
-    process_unary_expression:
+process_unary_expression:
       parser_process_unary_expression (context_p, grouping_level);
 
       if (JERRY_LIKELY (grouping_level != PARSE_EXPR_LEFT_HAND_SIDE))
diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c
index ce0a51bc63..c2a4259cd6 100644
--- a/jerry-core/parser/js/js-parser-statm.c
+++ b/jerry-core/parser/js/js-parser-statm.c
@@ -3311,7 +3311,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */
       parser_raise_error (context_p, PARSER_ERR_SEMICOLON_EXPECTED);
     }
 
-  consume_last_statement:
+consume_last_statement:
     while (true)
     {
       switch (context_p->stack_top_uint8)
diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c
index e1f14021c4..4e02919302 100644
--- a/jerry-core/parser/js/js-scanner.c
+++ b/jerry-core/parser/js/js-scanner.c
@@ -3388,7 +3388,7 @@ scanner_scan_all (parser_context_t *context_p) /**< context */
       lexer_next_token (context_p);
     }
 
-  scan_completed:
+scan_completed:
     if (context_p->stack_top_uint8 != SCAN_STACK_SCRIPT && context_p->stack_top_uint8 != SCAN_STACK_SCRIPT_FUNCTION)
     {
       scanner_raise_error (context_p);
diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c
index 38b9ab528a..409c8e2527 100644
--- a/jerry-core/vm/vm.c
+++ b/jerry-core/vm/vm.c
@@ -4674,13 +4674,13 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
         VM_GET_REGISTERS (frame_ctx_p)[0] = result;
       }
 
-    free_both_values:
+free_both_values:
       ecma_fast_free_value (right_value);
-    free_left_value:
+free_left_value:
       ecma_fast_free_value (left_value);
     }
 
-  error:
+error:
     ecma_fast_free_value (left_value);
     ecma_fast_free_value (right_value);
 
@@ -4851,7 +4851,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
       } while (frame_ctx_p->context_depth > 0);
     }
 
-  finish:
+finish:
     frame_ctx_p->call_operation = VM_NO_EXEC_OP;
     return result;
   }